diff --git a/.gitignore b/.gitignore index 3687a7c..fe92f24 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ # vendor/ examples -.idea \ No newline at end of file +.idea +*.log \ No newline at end of file diff --git a/previewer.conf b/previewer.conf index 57ceb43..20d8440 100644 --- a/previewer.conf +++ b/previewer.conf @@ -5,7 +5,7 @@ Port = "80" [Cache] Capasity = 20 -[Logger] -File = "./previewer.log" +[Log] +File = "previewer.log" Level = "INFO" MuteStdout = false \ No newline at end of file diff --git a/previewer/application/application.go b/previewer/application/application.go index 74ae7ae..80090a2 100644 --- a/previewer/application/application.go +++ b/previewer/application/application.go @@ -18,14 +18,14 @@ type App struct { func New(conf config.Config) *App { loger, err := logger.New(conf.Log) if err != nil { - oslog.Fatal("не удалось прикрутить логгер") + oslog.Fatal("не удалось прикрутить логгер: ", err.Error()) } return &App{Server: &http.Server{Addr: net.JoinHostPort(conf.Server.Address, conf.Server.Port), Handler: LoggingMiddleware(http.HandlerFunc(Handler), loger)}, Log: loger} } func Handler(w http.ResponseWriter, r *http.Request) { w.WriteHeader(200) - _, _ = w.Write([]byte("Hello! I'm calendar app!")) + _, _ = w.Write([]byte("Hello! Хрен вам, а не картинка!!!")) } func LoggingMiddleware(next http.Handler, l logger.Interface) http.HandlerFunc { diff --git a/previewer/config/config.go b/previewer/config/config.go index 734f587..05d410e 100644 --- a/previewer/config/config.go +++ b/previewer/config/config.go @@ -13,7 +13,7 @@ type Config struct { Port string } Cache struct { - Capasity string + Capasity int } Log struct { File string diff --git a/previewer/logger/logger.go b/previewer/logger/logger.go index a214609..7211994 100644 --- a/previewer/logger/logger.go +++ b/previewer/logger/logger.go @@ -49,7 +49,7 @@ func New(conf Config) (Interface, error) { if err := amitralog.NewLogger(c, amitralog.InstanceZapLogger); err != nil { log.Fatalf("Could not instantiate log %s", err.Error()) } - l := amitralog.WithFields(amitralog.Fields{"hw": "12"}) + l := amitralog.WithFields(amitralog.Fields{"service": "previewer"}) return l, nil }