From 4193b6e80332236efd7bb7d1ade182f1f017d33e Mon Sep 17 00:00:00 2001
From: azak <azak@protonmail.com>
Date: Fri, 6 Nov 2020 15:35:19 +0100
Subject: [PATCH] Log: adds SugarLogger to Badger

---
 job_test.go   | 20 --------------------
 restrouter.go |  5 ++++-
 store.go      | 22 ++++++++++++++++++++--
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/job_test.go b/job_test.go
index 6498fba..de8c271 100644
--- a/job_test.go
+++ b/job_test.go
@@ -1,9 +1,7 @@
 package main
 
 import (
-	"bytes"
 	"fmt"
-	"os"
 	"os/exec"
 	"testing"
 	"time"
@@ -72,21 +70,3 @@ func TestJobRunJob(t *testing.T) {
 	assert.Equal(t, "TEST=hallo\n", j.Stdout.String())
 	assert.Equal(t, "", j.Stderr.String())
 }
-
-func TestJobQueueStatus(t *testing.T) {
-	fmt.Println("running: TestJobQueueStatus")
-	t.Cleanup(clear)
-
-	cmd := exec.Command("echo", "hallo")
-
-	job := CreateJobFromCommand(cmd, "test1")
-	var infoBuffer bytes.Buffer
-
-	GetLogger().SetOutput(&infoBuffer)
-	job.QueueStatus()
-
-	assert.NotEmpty(t, infoBuffer)
-
-	GetLogger().SetOutput(os.Stdout)
-	Sugar.Info("test: ", infoBuffer.String())
-}
diff --git a/restrouter.go b/restrouter.go
index 76b994e..196752d 100644
--- a/restrouter.go
+++ b/restrouter.go
@@ -442,7 +442,10 @@ func RunRestServer(address string) (*http.Server, func()) {
 }
 
 func CreateRestHandler() http.Handler {
-	r := gin.Default()
+	r := gin.New()
+	r.Use(gin.LoggerWithConfig(*logconfig))
+	r.Use(gin.Recovery())
+
 	r.GET("/ping", func(c *gin.Context) {
 		c.JSON(200, gin.H{
 			REST_JSON_MESSAGE: "pong",
diff --git a/store.go b/store.go
index 8b344ed..b91e111 100644
--- a/store.go
+++ b/store.go
@@ -14,14 +14,32 @@ import (
 
 var closed = true
 
+type defaultLog struct{}
+
+func (l *defaultLog) Errorf(f string, v ...interface{}) {
+	Sugar.Errorf(f, v...)
+}
+
+func (l *defaultLog) Infof(f string, v ...interface{}) {
+	Sugar.Infof(f, v...)
+}
+
+func (l *defaultLog) Debugf(f string, v ...interface{}) {
+	Sugar.Debugf(f, v...)
+}
+func (l *defaultLog) Warningf(f string, v ...interface{}) {
+	Sugar.Warnf(f, v...)
+}
+
 func InitDB(path string, masterkey string, debug bool) *badger.DB {
 	var opt badger.Options
+
 	if debug {
 		Sugar.Warn("Debug is on switching to InMemory")
 
-		opt = badger.DefaultOptions("").WithInMemory(true)
+		opt = badger.DefaultOptions("").WithInMemory(true).WithLogger(&defaultLog{})
 	} else {
-		opt = badger.DefaultOptions(path)
+		opt = badger.DefaultOptions(path).WithLogger(&defaultLog{})
 	}
 
 	if masterkey != "" {