add logid

cmd/feedbox/init_env.go

@@ -7,6 +7,7 @@ import (
 	"syscall"
 
 	"github.com/joho/godotenv"
+	"github.com/rs/xid"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/pkgerrors"
 
@@ -26,8 +27,17 @@ func initEnv() {
 	util.CheckEnvs("ENV")
 }
 
-func initLogger() {
+type LogIdHook struct{}
+
+func (h LogIdHook) Run(e *zerolog.Event, _ zerolog.Level, _ string) {
+	e.Str("logId", xid.New().String())
+}
+
+func initLogger() zerolog.Logger {
 	zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack // nolint:reassign
+	logger := zerolog.New(os.Stderr).With().Timestamp().Logger()
+	logger = logger.Hook(LogIdHook{})
+	return logger
 }
 
 func initDatabase(ctx context.Context) {

cmd/feedbox/main.go

@@ -36,12 +36,11 @@ func main() {
 ///
 
 func startServerAndWorker() {
-	logger := zerolog.New(os.Stderr).With().Timestamp().Logger()
+	initEnv()
+	logger := initLogger()
 	ctx, cancel := context.WithCancel(context.Background())
 	ctx = logger.WithContext(ctx)
 
-	initEnv()
-	initLogger()
 	initDatabase(ctx)
 	defer database.Close()
 	initEmail()
@@ -69,12 +68,11 @@ func startServerAndWorker() {
 }
 
 func startServer() {
-	logger := zerolog.New(os.Stderr).With().Timestamp().Logger()
+	initEnv()
+	logger := initLogger()
 	ctx, cancel := context.WithCancel(context.Background())
 	ctx = logger.WithContext(ctx)
 
-	initEnv()
-	initLogger()
 	initDatabase(ctx)
 	defer database.Close()
 	initEmail()
@@ -87,11 +85,10 @@ func startServer() {
 }
 
 func startWorker() {
-	logger := zerolog.New(os.Stderr).With().Timestamp().Logger()
+	initEnv()
+	logger := initLogger()
 	ctx := logger.WithContext(context.Background())
 
-	initEnv()
-	initLogger()
 	initDatabase(ctx)
 	initEmail()
 	initTelegram()