Небольшие правки, чтобы запустился сервис.
This commit is contained in:
parent
ea1065dcc0
commit
8432b5a165
1
.gitignore
vendored
1
.gitignore
vendored
@ -16,3 +16,4 @@
|
|||||||
|
|
||||||
examples
|
examples
|
||||||
.idea
|
.idea
|
||||||
|
*.log
|
@ -5,7 +5,7 @@ Port = "80"
|
|||||||
[Cache]
|
[Cache]
|
||||||
Capasity = 20
|
Capasity = 20
|
||||||
|
|
||||||
[Logger]
|
[Log]
|
||||||
File = "./previewer.log"
|
File = "previewer.log"
|
||||||
Level = "INFO"
|
Level = "INFO"
|
||||||
MuteStdout = false
|
MuteStdout = false
|
@ -18,14 +18,14 @@ type App struct {
|
|||||||
func New(conf config.Config) *App {
|
func New(conf config.Config) *App {
|
||||||
loger, err := logger.New(conf.Log)
|
loger, err := logger.New(conf.Log)
|
||||||
if err != nil {
|
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}
|
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) {
|
func Handler(w http.ResponseWriter, r *http.Request) {
|
||||||
w.WriteHeader(200)
|
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 {
|
func LoggingMiddleware(next http.Handler, l logger.Interface) http.HandlerFunc {
|
||||||
|
@ -13,7 +13,7 @@ type Config struct {
|
|||||||
Port string
|
Port string
|
||||||
}
|
}
|
||||||
Cache struct {
|
Cache struct {
|
||||||
Capasity string
|
Capasity int
|
||||||
}
|
}
|
||||||
Log struct {
|
Log struct {
|
||||||
File string
|
File string
|
||||||
|
@ -49,7 +49,7 @@ func New(conf Config) (Interface, error) {
|
|||||||
if err := amitralog.NewLogger(c, amitralog.InstanceZapLogger); err != nil {
|
if err := amitralog.NewLogger(c, amitralog.InstanceZapLogger); err != nil {
|
||||||
log.Fatalf("Could not instantiate log %s", err.Error())
|
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
|
return l, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user