1 files changed, 44 insertions, 0 deletions
diff --git a/internal/gtscontext/log_hooks.go b/internal/gtscontext/log_hooks.go
new file mode 100644
index 000000000..2fe43e488
--- /dev/null
+++ b/internal/gtscontext/log_hooks.go
@@ -0,0 +1,44 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package gtscontext
+
+import (
+	"context"
+
+	"codeberg.org/gruf/go-kv"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
+)
+
+func init() {
+	// Add our required logging hooks on application initialization.
+	//
+	// Request ID middleware hook.
+	log.Hook(func(ctx context.Context, kvs []kv.Field) []kv.Field {
+		if id := RequestID(ctx); id != "" {
+			return append(kvs, kv.Field{K: "requestID", V: id})
+		}
+		return kvs
+	})
+	// Client IP middleware hook.
+	log.Hook(func(ctx context.Context, kvs []kv.Field) []kv.Field {
+		if id := PublicKeyID(ctx); id != "" {
+			return append(kvs, kv.Field{K: "pubKeyID", V: id})
+		}
+		return kvs
+	})
+}