diff --git a/logging.go b/logging.go index 9d7b2f5..2509259 100644 --- a/logging.go +++ b/logging.go @@ -17,6 +17,14 @@ import ( log "github.com/sirupsen/logrus" ) +func init() { + log.SetFormatter(&log.TextFormatter{ + FullTimestamp: true, + TimestampFormat: "2006-01-02 15:04:05", + }) + log.SetLevel(log.InfoLevel) +} + func toglog(l log.Level) glog.Lvl { switch l { case log.DebugLevel: diff --git a/main.go b/main.go index e5cbdee..b5193d0 100644 --- a/main.go +++ b/main.go @@ -12,7 +12,6 @@ import ( "git.erbosoft.com/amy/amsterdam/ui" "github.com/labstack/echo/v4" "github.com/labstack/echo/v4/middleware" - log "github.com/sirupsen/logrus" ) func setupEcho() *echo.Echo { @@ -21,21 +20,17 @@ func setupEcho() *echo.Echo { e.Renderer = &ui.TemplateRenderer{} e.Use(middleware.Recover()) e.Use(LogrusMiddleware) + e.GET("/img/*", ui.AmWrap(ui.AmServeImage)) e.GET("/", ui.AmWrap(func(ctxt ui.AmContext) (string, any, error) { ctxt.VarMap().Set("amsterdam_pageTitle", "My Front Page") return "framed_template", "top.jet", nil })) + return e } func main() { - log.SetFormatter(&log.TextFormatter{ - FullTimestamp: true, - TimestampFormat: "2006-01-02 15:04:05", - }) - log.SetLevel(log.InfoLevel) - e := setupEcho() e.Logger.Fatal(e.Start(":1323"))