From a5047b7e8b44d640e1e8a18b7f69a5ff724abc6e Mon Sep 17 00:00:00 2001 From: dalbodeule <11470513+dalbodeule@users.noreply.github.com> Date: Thu, 16 Oct 2025 23:00:54 +0900 Subject: [PATCH] debug, identify code added. --- inc.env | 3 ++- main.go | 10 ++++++---- utils/config.go | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/inc.env b/inc.env index a62b5f2..464c471 100644 --- a/inc.env +++ b/inc.env @@ -2,4 +2,5 @@ PORT=2222 GEOIP_DB=GeoLite2-City.mmdb DB_DSN="postgrtesql://postgres:password@localhost/postgres" ROOT_PATH="./" -LOKI_HOST="" \ No newline at end of file +LOKI_HOST="" +IDENTIFY="localdev" \ No newline at end of file diff --git a/main.go b/main.go index eaf0077..1ee1aef 100644 --- a/main.go +++ b/main.go @@ -75,7 +75,7 @@ func sessionHandler(s ssh.Session, geoip *geoip2.Reader, pgDb *bun.DB, logger *s client.EventLoop() } -func getLogger(lokiHost string) (*slog.Logger, error) { +func getLogger(lokiHost string, identify string) (*slog.Logger, error) { if lokiHost == "" { logger := slog.New(slog.NewTextHandler(os.Stdout, nil)) logger.Info("Loki host is not set. Logging to stdout") @@ -90,7 +90,6 @@ func getLogger(lokiHost string) (*slog.Logger, error) { slog.Error("Failed to create Loki client", "error", err) return nil, err } - defer client.Stop() logger := slog.New( slogmulti.Fanout( @@ -98,14 +97,17 @@ func getLogger(lokiHost string) (*slog.Logger, error) { slogloki.Option{Level: slog.LevelDebug, Client: client}.NewLokiHandler(), ), ) - logger = logger.With(slog.String("app", "sshchat")) + logger = logger.With( + slog.String("app", "sshchat"), + slog.String("identify", identify), + ) logger.Info("Logging to Loki", "host", lokiHost) return logger, nil } func main() { - logger, err := getLogger(config.LokiHost) + logger, err := getLogger(config.LokiHost, config.Identify) if err != nil { logger.Error("Failed to create logger", "error", err) return diff --git a/utils/config.go b/utils/config.go index 8f7e57e..54211bc 100644 --- a/utils/config.go +++ b/utils/config.go @@ -14,6 +14,7 @@ type Config struct { PgDsn string RootPath string LokiHost string + Identify string } func GetConfig() *Config { @@ -25,6 +26,7 @@ func GetConfig() *Config { pgDsn := os.Getenv("DB_DSN") rootPath := os.Getenv("ROOT_PATH") lokiHost := os.Getenv("LOKI_HOST") + identify := os.Getenv("IDENTIFY") return &Config{ Port: port, @@ -33,5 +35,6 @@ func GetConfig() *Config { PgDsn: pgDsn, RootPath: rootPath, LokiHost: lokiHost, + Identify: identify, } }