Simplify/improve logging configuration

pkg/cli/helpers.go

@@ -6,21 +6,14 @@ import (
 	"time"
 
 	"github.com/getsentry/sentry-go"
-	"go.uber.org/zap"
 
 	"github.com/cortezaproject/corteza-server/internal/auth"
 	"github.com/cortezaproject/corteza-server/internal/http"
 	"github.com/cortezaproject/corteza-server/internal/mail"
 	"github.com/cortezaproject/corteza-server/pkg/cli/options"
-	"github.com/cortezaproject/corteza-server/pkg/logger"
 )
 
-func InitGeneralServices(logOpt *options.LogOpt, smtpOpt *options.SMTPOpt, jwtOpt *options.JWTOpt, httpClientOpt *options.HttpClientOpt) {
-	// Reset logger's level to whatever we want
-	var logLevel = zap.InfoLevel
-	_ = logLevel.Set(logOpt.Level)
-	logger.DefaultLevel.SetLevel(logLevel)
-
+func InitGeneralServices(smtpOpt *options.SMTPOpt, jwtOpt *options.JWTOpt, httpClientOpt *options.HttpClientOpt) {
 	auth.SetupDefault(jwtOpt.Secret, int(jwtOpt.Expiry/time.Minute))
 	mail.SetupDialer(smtpOpt.Host, smtpOpt.Port, smtpOpt.User, smtpOpt.Pass, smtpOpt.From)
 	http.SetupDefaults(

pkg/cli/options/log.go

@@ -1,19 +0,0 @@
-package options
-
-type (
-	// Logger's output leve is configured here, but
-	// dev/prod configuration happens earlier
-	LogOpt struct {
-		Level string `env:"LOG_LEVEL"`
-	}
-)
-
-func Log(pfix string) (o *LogOpt) {
-	o = &LogOpt{
-		Level: "info",
-	}
-
-	fill(o, pfix)
-
-	return
-}

pkg/cli/runner.go

@@ -43,7 +43,6 @@ type (
 		Log        *zap.Logger
 
 		// General options
-		LogOpt        *options.LogOpt
 		SmtpOpt       *options.SMTPOpt
 		JwtOpt        *options.JWTOpt
 		HttpClientOpt *options.HttpClientOpt
@@ -175,7 +174,6 @@ func (c *Config) Init() {
 		c.DatabaseName = c.ServiceName
 	}
 
-	c.LogOpt = options.Log(c.EnvPrefix)
 	c.SmtpOpt = options.SMTP(c.EnvPrefix)
 	c.JwtOpt = options.JWT(c.EnvPrefix)
 	c.HttpClientOpt = options.HttpClient(c.EnvPrefix)
@@ -221,7 +219,7 @@ func (c *Config) MakeCLI(ctx context.Context) (cmd *cobra.Command) {
 			}
 
 			defer sentry.Recover()
-			InitGeneralServices(c.LogOpt, c.SmtpOpt, c.JwtOpt, c.HttpClientOpt)
+			InitGeneralServices(c.SmtpOpt, c.JwtOpt, c.HttpClientOpt)
 
 			err = c.RootCommandDBSetup.Run(ctx, cmd, c)
 			if err != nil {