|
|
|
@ -10,15 +10,22 @@ import ( |
|
|
|
|
|
|
|
|
|
|
|
type Logger struct { |
|
|
|
type Logger struct { |
|
|
|
*logrus.Logger |
|
|
|
*logrus.Logger |
|
|
|
|
|
|
|
tags map[string]string |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
func NewLogger(appSource string, dsn string) *Logger { |
|
|
|
func NewLogger(appSource string, dsn string) *Logger { |
|
|
|
logger := logrus.New() |
|
|
|
logger := Logger{ |
|
|
|
logger.SetReportCaller(true) // Добавим отображение строки
|
|
|
|
Logger: logrus.New(), |
|
|
|
|
|
|
|
tags: make(map[string]string), |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
|
|
|
|
logger.tags["app"] = appSource |
|
|
|
|
|
|
|
logger.Logger.SetReportCaller(true) // Добавим отображение строки
|
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
if dsn == "" { |
|
|
|
if dsn == "" { |
|
|
|
logger.Warn("sentry dsn is empty, its use is not possible") |
|
|
|
logger.Logger.Warn("sentry dsn is empty, its use is not possible") |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
if hook, err := logrus_sentry.NewSentryHook(dsn, []logrus.Level{ |
|
|
|
if hook, err := logrus_sentry.NewSentryHook(dsn, []logrus.Level{ |
|
|
|
logrus.PanicLevel, |
|
|
|
logrus.PanicLevel, |
|
|
|
@ -29,19 +36,13 @@ func NewLogger(appSource string, dsn string) *Logger { |
|
|
|
}); err != nil { |
|
|
|
}); err != nil { |
|
|
|
log.Fatal(err) |
|
|
|
log.Fatal(err) |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
//
|
|
|
|
|
|
|
|
tags := make(map[string]string) |
|
|
|
|
|
|
|
tags["app"] = appSource |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
hook.Timeout = 1 * time.Second |
|
|
|
hook.Timeout = 1 * time.Second |
|
|
|
hook.SetTagsContext(tags) |
|
|
|
hook.SetTagsContext(logger.tags) |
|
|
|
|
|
|
|
|
|
|
|
//
|
|
|
|
//
|
|
|
|
logger.Hooks.Add(hook) |
|
|
|
logger.Logger.Hooks.Add(hook) |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
return &Logger{ |
|
|
|
return &logger |
|
|
|
Logger: logger, |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
slaventius@odnookno.info
2 years ago