mirror of
https://github.com/dalbodeule/sshchat.git
synced 2025-12-07 22:55:44 +09:00
debug, identify code added.
This commit is contained in:
1
inc.env
1
inc.env
@@ -3,3 +3,4 @@ GEOIP_DB=GeoLite2-City.mmdb
|
|||||||
DB_DSN="postgrtesql://postgres:password@localhost/postgres"
|
DB_DSN="postgrtesql://postgres:password@localhost/postgres"
|
||||||
ROOT_PATH="./"
|
ROOT_PATH="./"
|
||||||
LOKI_HOST=""
|
LOKI_HOST=""
|
||||||
|
IDENTIFY="localdev"
|
||||||
10
main.go
10
main.go
@@ -75,7 +75,7 @@ func sessionHandler(s ssh.Session, geoip *geoip2.Reader, pgDb *bun.DB, logger *s
|
|||||||
client.EventLoop()
|
client.EventLoop()
|
||||||
}
|
}
|
||||||
|
|
||||||
func getLogger(lokiHost string) (*slog.Logger, error) {
|
func getLogger(lokiHost string, identify string) (*slog.Logger, error) {
|
||||||
if lokiHost == "" {
|
if lokiHost == "" {
|
||||||
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
|
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
|
||||||
logger.Info("Loki host is not set. Logging to stdout")
|
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)
|
slog.Error("Failed to create Loki client", "error", err)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer client.Stop()
|
|
||||||
|
|
||||||
logger := slog.New(
|
logger := slog.New(
|
||||||
slogmulti.Fanout(
|
slogmulti.Fanout(
|
||||||
@@ -98,14 +97,17 @@ func getLogger(lokiHost string) (*slog.Logger, error) {
|
|||||||
slogloki.Option{Level: slog.LevelDebug, Client: client}.NewLokiHandler(),
|
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)
|
logger.Info("Logging to Loki", "host", lokiHost)
|
||||||
|
|
||||||
return logger, nil
|
return logger, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
logger, err := getLogger(config.LokiHost)
|
logger, err := getLogger(config.LokiHost, config.Identify)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Error("Failed to create logger", "error", err)
|
logger.Error("Failed to create logger", "error", err)
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ type Config struct {
|
|||||||
PgDsn string
|
PgDsn string
|
||||||
RootPath string
|
RootPath string
|
||||||
LokiHost string
|
LokiHost string
|
||||||
|
Identify string
|
||||||
}
|
}
|
||||||
|
|
||||||
func GetConfig() *Config {
|
func GetConfig() *Config {
|
||||||
@@ -25,6 +26,7 @@ func GetConfig() *Config {
|
|||||||
pgDsn := os.Getenv("DB_DSN")
|
pgDsn := os.Getenv("DB_DSN")
|
||||||
rootPath := os.Getenv("ROOT_PATH")
|
rootPath := os.Getenv("ROOT_PATH")
|
||||||
lokiHost := os.Getenv("LOKI_HOST")
|
lokiHost := os.Getenv("LOKI_HOST")
|
||||||
|
identify := os.Getenv("IDENTIFY")
|
||||||
|
|
||||||
return &Config{
|
return &Config{
|
||||||
Port: port,
|
Port: port,
|
||||||
@@ -33,5 +35,6 @@ func GetConfig() *Config {
|
|||||||
PgDsn: pgDsn,
|
PgDsn: pgDsn,
|
||||||
RootPath: rootPath,
|
RootPath: rootPath,
|
||||||
LokiHost: lokiHost,
|
LokiHost: lokiHost,
|
||||||
|
Identify: identify,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user