Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

add logging

goenning7fff1cbdb6cc
diff --git a/router/renderer.go b/router/renderer.go
index 1ef1bbf37..0289c8c15 100644
--- a/router/renderer.go
+++ b/router/renderer.go
@@ -4,12 +4,12 @@ import (
"fmt"
"html/template"
"io"
- "log"
"os"
"github.com/WeCanHearYou/wchy/env"
"github.com/labstack/echo"
+ "github.com/labstack/gommon/log"
)
//HTMLRenderer renderer
@@ -38,7 +38,7 @@ func NewHTMLRenderer() *HTMLRenderer {
func (r *HTMLRenderer) add(name string) {
tpl, err := template.ParseFiles(path+"base.html", path+name)
if err != nil {
- log.Fatal(err)
+ log.Error(err)
}
r.templates[name] = tpl
diff --git a/router/router.go b/router/router.go
index b5cd7d335..a5f24f640 100644
--- a/router/router.go
+++ b/router/router.go
@@ -1,24 +1,41 @@
package router
import (
- "fmt"
-
"net/http"
+ "strings"
+
"github.com/WeCanHearYou/wchy/context"
+ "github.com/WeCanHearYou/wchy/env"
"github.com/WeCanHearYou/wchy/handler"
"github.com/labstack/echo"
+ "github.com/labstack/gommon/log"
)
func errorHandler(e error, c echo.Context) {
- fmt.Println(e)
- c.NoContent(http.StatusInternalServerError)
+ if strings.Contains(e.Error(), "code=404") {
+ c.Logger().Debugf("%s not found.", c.Request().URL)
+ c.NoContent(http.StatusNotFound)
+ } else {
+ c.Logger().Error(e)
+ c.NoContent(http.StatusInternalServerError)
+ }
}
// GetMainEngine returns main HTTP engine
func GetMainEngine(ctx *context.WchyContext) *echo.Echo {
router := echo.New()
+ logger := log.New("")
+ logger.SetHeader(`${level} [${time_rfc3339}] ${short_file}:${line}`)
+
+ if env.IsProduction() {
+ logger.SetLevel(log.INFO)
+ } else {
+ logger.SetLevel(log.DEBUG)
+ }
+
+ router.Logger = logger
router.Renderer = NewHTMLRenderer()
router.HTTPErrorHandler = errorHandler