Refactor and improve tests for SystemServiceLogHook

gitlabhq · Oct 22, 2018 · d9ea00d · d9ea00d
1 parent 10e4de4
commit d9ea00d
Show file tree

Hide file tree

Showing 6 changed files with 309 additions and 34 deletions.
diff --git a/Makefile b/Makefile
@@ -151,11 +151,12 @@ dockerfiles:
 mocks: $(MOCKERY)
 	rm -rf ./helpers/service/mocks
 	find . -type f ! -path '*vendor/*' -name 'mock_*' -delete
-	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./vendor/github.com/ayufan/golang-kardianos-service -output=./helpers/service/mocks -name='(Interface|Logger)'
+	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./vendor/github.com/ayufan/golang-kardianos-service -output=./helpers/service/mocks -name='(Interface)'
 	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./helpers/docker -all -inpkg
 	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./helpers/certificate -all -inpkg
 	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./cache -all -inpkg
 	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./common -all -inpkg
+	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./log -all -inpkg
 	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./session -all -inpkg
 	GOPATH=$(ORIGINAL_GOPATH) mockery $(MOCKERY_FLAGS) -dir=./shells -all -inpkg
 

diff --git a/commands/multi.go b/commands/multi.go
@@ -664,7 +664,7 @@ func (mr *RunCommand) Execute(context *cli.Context) {
 	}
 
 	if mr.Syslog {
-		log.SetSystemLogger(svc)
+		log.SetSystemLogger(logrus.StandardLogger(), svc)
 	}
 
 	logrus.AddHook(&mr.sentryLogHook)

diff --git a/helpers/service/mocks/Logger.go → log/mock_systemLogger.go b/helpers/service/mocks/Logger.go → log/mock_systemLogger.go
diff --git a/log/mock_systemService.go b/log/mock_systemService.go
diff --git a/log/system_logger.go b/log/system_logger.go
@@ -5,12 +5,20 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-type ServiceLogHook struct {
+type systemLogger interface {
 	service.Logger
+}
+
+type systemService interface {
+	service.Service
+}
+
+type SystemServiceLogHook struct {
+	systemLogger
 	Level logrus.Level
 }
 
-func (s *ServiceLogHook) Levels() []logrus.Level {
+func (s *SystemServiceLogHook) Levels() []logrus.Level {
 	return []logrus.Level{
 		logrus.PanicLevel,
 		logrus.FatalLevel,
@@ -20,7 +28,7 @@ func (s *ServiceLogHook) Levels() []logrus.Level {
 	}
 }
 
-func (s *ServiceLogHook) Fire(entry *logrus.Entry) error {
+func (s *SystemServiceLogHook) Fire(entry *logrus.Entry) error {
 	if entry.Level > s.Level {
 		return nil
 	}
@@ -42,12 +50,16 @@ func (s *ServiceLogHook) Fire(entry *logrus.Entry) error {
 	return nil
 }
 
-func SetSystemLogger(svc service.Service) {
+func SetSystemLogger(logrusLogger *logrus.Logger, svc systemService) {
 	logger, err := svc.SystemLogger(nil)
 
 	if err == nil {
-		logrus.AddHook(&ServiceLogHook{logger, logrus.GetLevel()})
+		hook := new(SystemServiceLogHook)
+		hook.systemLogger = logger
+		hook.Level = logrus.GetLevel()
+
+		logrusLogger.AddHook(hook)
 	} else {
-		logrus.WithError(err).Error("Error while setting up the system logger")
+		logrusLogger.WithError(err).Error("Error while setting up the system logger")
 	}
 }