Fixup previous commit to avoid using blank imports

owncloud · Jul 7, 2022 · 875ad91 · 875ad91
1 parent 33f6ee3
commit 875ad91
Show file tree

Hide file tree

Showing 33 changed files with 45 additions and 66 deletions.
diff --git a/ocis-pkg/log/gomicro/log.go b/ocis-pkg/log/gomicro/log.go
diff --git a/ocis-pkg/log/log.go b/ocis-pkg/log/log.go
@@ -6,12 +6,37 @@ import (
 	"strings"
 	"time"
 
+	mzlog "github.com/go-micro/plugins/v4/logger/zerolog"
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
-
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
+	"go-micro.dev/v4/logger"
 )
 
+func init() {
+	// this is ugly, but "logger.DefaultLogger" is a global variable and we need to set it _before_ anybody uses it
+	setMicroLogger()
+}
+
+// for logging reasons we don't want the same logging level on both oCIS and micro. As a framework builder we do not
+// want to expose to the end user the internal framework logs unless explicitly specified.
+func setMicroLogger() {
+	if os.Getenv("MICRO_LOG_LEVEL") == "" {
+		_ = os.Setenv("MICRO_LOG_LEVEL", "error")
+	}
+
+	lev, err := zerolog.ParseLevel(os.Getenv("MICRO_LOG_LEVEL"))
+	if err != nil {
+		lev = zerolog.ErrorLevel
+	}
+	logger.DefaultLogger = mzlog.NewLogger(
+		logger.WithLevel(logger.Level(lev)),
+		logger.WithFields(map[string]interface{}{
+			"system": "go-micro",
+		}),
+	)
+}
+
 // Logger simply wraps the zerolog logger.
 type Logger struct {
 	zerolog.Logger

diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go
@@ -15,6 +15,7 @@ import (
 
 	"github.com/owncloud/ocis/v2/ocis-pkg/shared"
 
+	mzlog "github.com/go-micro/plugins/v4/logger/zerolog"
 	"github.com/mohae/deepcopy"
 	"github.com/olekukonko/tablewriter"
 
@@ -49,9 +50,9 @@ import (
 	users "github.com/owncloud/ocis/v2/services/users/pkg/command"
 	web "github.com/owncloud/ocis/v2/services/web/pkg/command"
 	webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/command"
+	"github.com/rs/zerolog"
 	"github.com/thejerf/suture/v4"
-
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
+	"go-micro.dev/v4/logger"
 )
 
 var (
@@ -156,6 +157,8 @@ func Start(o ...Option) error {
 	halt := make(chan os.Signal, 1)
 	signal.Notify(halt, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
 
+	setMicroLogger()
+
 	// tolerance controls backoff cycles from the supervisor.
 	tolerance := 5
 	totalBackoff := 0
@@ -298,3 +301,17 @@ func trap(s *Service, halt chan os.Signal) {
 	s.Log.Debug().Str("service", "runtime service").Msgf("terminating with signal: %v", s)
 	os.Exit(0)
 }
+
+// for logging reasons we don't want the same logging level on both oCIS and micro. As a framework builder we do not
+// want to expose to the end user the internal framework logs unless explicitly specified.
+func setMicroLogger() {
+	if os.Getenv("MICRO_LOG_LEVEL") == "" {
+		_ = os.Setenv("MICRO_LOG_LEVEL", "error")
+	}
+
+	lev, err := zerolog.ParseLevel(os.Getenv("MICRO_LOG_LEVEL"))
+	if err != nil {
+		lev = zerolog.ErrorLevel
+	}
+	logger.DefaultLogger = mzlog.NewLogger(logger.WithLevel(logger.Level(lev)))
+}
diff --git a/services/app-provider/cmd/app-provider/main.go b/services/app-provider/cmd/app-provider/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/app-provider/pkg/command"
 	"github.com/owncloud/ocis/v2/services/app-provider/pkg/config/defaults"
 )

diff --git a/services/app-registry/cmd/app-registry/main.go b/services/app-registry/cmd/app-registry/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/app-registry/pkg/command"
 	"github.com/owncloud/ocis/v2/services/app-registry/pkg/config/defaults"
 )

diff --git a/services/audit/cmd/audit/main.go b/services/audit/cmd/audit/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/audit/pkg/command"
 	"github.com/owncloud/ocis/v2/services/audit/pkg/config/defaults"
 )

diff --git a/services/auth-basic/cmd/auth-basic/main.go b/services/auth-basic/cmd/auth-basic/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/auth-basic/pkg/command"
 	"github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/defaults"
 )

diff --git a/services/auth-bearer/cmd/auth-bearer/main.go b/services/auth-bearer/cmd/auth-bearer/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command"
 	"github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/defaults"
 )

diff --git a/services/auth-machine/cmd/auth-machine/main.go b/services/auth-machine/cmd/auth-machine/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/auth-machine/pkg/command"
 	"github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/defaults"
 )

diff --git a/services/frontend/cmd/frontend/main.go b/services/frontend/cmd/frontend/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/frontend/pkg/command"
 	"github.com/owncloud/ocis/v2/services/frontend/pkg/config/defaults"
 )

diff --git a/services/gateway/cmd/gateway/main.go b/services/gateway/cmd/gateway/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/gateway/pkg/command"
 	"github.com/owncloud/ocis/v2/services/gateway/pkg/config/defaults"
 )

diff --git a/services/graph-explorer/cmd/graph-explorer/main.go b/services/graph-explorer/cmd/graph-explorer/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/command"
 	"github.com/owncloud/ocis/v2/services/graph-explorer/pkg/config/defaults"
 )

diff --git a/services/graph/cmd/graph/main.go b/services/graph/cmd/graph/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/graph/pkg/command"
 	"github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults"
 )

diff --git a/services/groups/cmd/groups/main.go b/services/groups/cmd/groups/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/groups/pkg/command"
 	"github.com/owncloud/ocis/v2/services/groups/pkg/config/defaults"
 )

diff --git a/services/idm/cmd/idm/main.go b/services/idm/cmd/idm/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/idm/pkg/command"
 	"github.com/owncloud/ocis/v2/services/idm/pkg/config/defaults"
 )

diff --git a/services/idp/cmd/idp/main.go b/services/idp/cmd/idp/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/idp/pkg/command"
 	"github.com/owncloud/ocis/v2/services/idp/pkg/config/defaults"
 )

diff --git a/services/nats/cmd/nats/main.go b/services/nats/cmd/nats/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/nats/pkg/command"
 	"github.com/owncloud/ocis/v2/services/nats/pkg/config/defaults"
 )

diff --git a/services/notifications/cmd/notifications/main.go b/services/notifications/cmd/notifications/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/notifications/pkg/command"
 	"github.com/owncloud/ocis/v2/services/notifications/pkg/config/defaults"
 )

diff --git a/services/ocdav/cmd/ocdav/main.go b/services/ocdav/cmd/ocdav/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/ocdav/pkg/command"
 	"github.com/owncloud/ocis/v2/services/ocdav/pkg/config/defaults"
 )

diff --git a/services/ocs/cmd/ocs/main.go b/services/ocs/cmd/ocs/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/ocs/pkg/command"
 	"github.com/owncloud/ocis/v2/services/ocs/pkg/config/defaults"
 )

diff --git a/services/proxy/cmd/proxy/main.go b/services/proxy/cmd/proxy/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/proxy/pkg/command"
 	"github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults"
 )

diff --git a/services/search/cmd/search/main.go b/services/search/cmd/search/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/search/pkg/command"
 	"github.com/owncloud/ocis/v2/services/search/pkg/config/defaults"
 )

diff --git a/services/settings/cmd/settings/main.go b/services/settings/cmd/settings/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/settings/pkg/command"
 	"github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults"
 )

diff --git a/services/sharing/cmd/sharing/main.go b/services/sharing/cmd/sharing/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/sharing/pkg/command"
 	"github.com/owncloud/ocis/v2/services/sharing/pkg/config/defaults"
 )

diff --git a/services/storage-publiclink/cmd/storage-publiclink/main.go b/services/storage-publiclink/cmd/storage-publiclink/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command"
 	"github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config/defaults"
 )

diff --git a/services/storage-shares/cmd/storage-shares/main.go b/services/storage-shares/cmd/storage-shares/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/storage-shares/pkg/command"
 	"github.com/owncloud/ocis/v2/services/storage-shares/pkg/config/defaults"
 )

diff --git a/services/storage-system/cmd/storage-system/main.go b/services/storage-system/cmd/storage-system/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/storage-system/pkg/command"
 	"github.com/owncloud/ocis/v2/services/storage-system/pkg/config/defaults"
 )

diff --git a/services/storage-users/cmd/storage-users/main.go b/services/storage-users/cmd/storage-users/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/storage-users/pkg/command"
 	"github.com/owncloud/ocis/v2/services/storage-users/pkg/config/defaults"
 )

diff --git a/services/store/cmd/store/main.go b/services/store/cmd/store/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/store/pkg/command"
 	"github.com/owncloud/ocis/v2/services/store/pkg/config/defaults"
 )

diff --git a/services/thumbnails/cmd/thumbnails/main.go b/services/thumbnails/cmd/thumbnails/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/thumbnails/pkg/command"
 	"github.com/owncloud/ocis/v2/services/thumbnails/pkg/config/defaults"
 )

diff --git a/services/users/cmd/user/main.go b/services/users/cmd/user/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/users/pkg/command"
 	"github.com/owncloud/ocis/v2/services/users/pkg/config/defaults"
 )

diff --git a/services/web/cmd/web/main.go b/services/web/cmd/web/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/web/pkg/command"
 	"github.com/owncloud/ocis/v2/services/web/pkg/config/defaults"
 )

diff --git a/services/webdav/cmd/webdav/main.go b/services/webdav/cmd/webdav/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"os"
 
-	_ "github.com/owncloud/ocis/v2/ocis-pkg/log/gomicro"
 	"github.com/owncloud/ocis/v2/services/webdav/pkg/command"
 	"github.com/owncloud/ocis/v2/services/webdav/pkg/config/defaults"
 )