Make log level configurable (#13)

README.md

@@ -67,6 +67,11 @@ Execution environment. Affects:
 
 Optional, can be set to `PRODUCTION` or `DEVELOPMENT`. Defaults to `PRODUCTION`.
 
+### `NOTIFICATIONS_LOG_LEVEL`
+
+Log level.
+
+Optional, can be set to `TRACE`, `DEBUG`, `ERROR` or `DISABLED`. Defaults to `DEBUG`.
 
 ### `FIRESTORE_EMULATOR_HOST`
 

cmd/notification-service/di/inject_logging.go

@@ -2,29 +2,36 @@ package di
 
 import (
 	"github.com/ThreeDotsLabs/watermill"
+	"github.com/boreq/errors"
 	"github.com/google/wire"
 	"github.com/planetary-social/go-notification-service/internal/logging"
+	"github.com/planetary-social/go-notification-service/service/config"
 	"github.com/sirupsen/logrus"
 )
 
 var loggingSet = wire.NewSet(
-	newSystemLogger,
-
-	logging.NewLogrusLoggingSystem,
-	wire.Bind(new(logging.LoggingSystem), new(logging.LogrusLoggingSystem)),
-
-	newLogrus,
+	newLogger,
 
 	logging.NewWatermillAdapter,
 	wire.Bind(new(watermill.LoggerAdapter), new(*logging.WatermillAdapter)),
 )
 
-func newSystemLogger(system logging.LoggingSystem) logging.Logger {
-	return logging.NewSystemLogger(system, "root")
-}
+func newLogger(config config.Config) (logging.Logger, error) {
+	if config.LogLevel() == logging.LevelDisabled {
+		return logging.NewDevNullLogger(), nil
+	}
 
-func newLogrus() *logrus.Logger {
 	v := logrus.New()
-	v.SetLevel(logrus.DebugLevel)
-	return v
+	switch config.LogLevel() {
+	case logging.LevelTrace:
+		v.SetLevel(logrus.TraceLevel)
+	case logging.LevelDebug:
+		v.SetLevel(logrus.DebugLevel)
+	case logging.LevelError:
+		v.SetLevel(logrus.ErrorLevel)
+	default:
+		return nil, errors.New("unsupported log level")
+	}
+
+	return logging.NewSystemLogger(logging.NewLogrusLoggingSystem(v), "root"), nil
 }

service/adapters/config/config.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	"github.com/boreq/errors"
+	"github.com/planetary-social/go-notification-service/internal/logging"
 	"github.com/planetary-social/go-notification-service/service/config"
 )
 
@@ -21,6 +22,7 @@ const (
 	envAPNSCertificatePath          = "APNS_CERTIFICATE_PATH"
 	envAPNSCertificatePassword      = "APNS_CERTIFICATE_PASSWORD"
 	envEnvironment                  = "ENVIRONMENT"
+	envLogLevel                     = "LOG_LEVEL"
 )
 
 type EnvironmentConfigLoader struct {
@@ -36,6 +38,11 @@ func (c *EnvironmentConfigLoader) Load() (config.Config, error) {
 		return config.Config{}, errors.Wrap(err, "error loading the environment setting")
 	}
 
+	logLevel, err := c.loadLogLevel()
+	if err != nil {
+		return config.Config{}, errors.Wrap(err, "error loading the log level")
+	}
+
 	var firestoreCredentialsJSON []byte
 	if p := c.getenv(envFirestoreCredentialsJSONPath); p != "" {
 		f, err := os.Open(p)
@@ -60,6 +67,7 @@ func (c *EnvironmentConfigLoader) Load() (config.Config, error) {
 		c.getenv(envAPNSCertificatePath),
 		c.getenv(envAPNSCertificatePassword),
 		environment,
+		logLevel,
 	)
 }
 
@@ -80,3 +88,21 @@ func (c *EnvironmentConfigLoader) loadEnvironment() (config.Environment, error)
 func (c *EnvironmentConfigLoader) getenv(key string) string {
 	return os.Getenv(fmt.Sprintf("%s_%s", envPrefix, key))
 }
+
+func (c *EnvironmentConfigLoader) loadLogLevel() (logging.Level, error) {
+	v := strings.ToUpper(os.Getenv(envLogLevel))
+	switch v {
+	case "TRACE":
+		return logging.LevelTrace, nil
+	case "DEBUG":
+		return logging.LevelDebug, nil
+	case "ERROR":
+		return logging.LevelError, nil
+	case "DISABLED":
+		return logging.LevelDisabled, nil
+	case "":
+		return logging.LevelDebug, nil
+	default:
+		return 0, fmt.Errorf("invalid log level requested '%s'", v)
+	}
+}

service/config/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/boreq/errors"
+	"github.com/planetary-social/go-notification-service/internal/logging"
 )
 
 type Environment struct {
@@ -27,6 +28,7 @@ type Config struct {
 	apnsCertificatePassword string
 
 	environment Environment
+	logLevel    logging.Level
 }
 
 func NewConfig(
@@ -38,6 +40,7 @@ func NewConfig(
 	apnsCertificatePath string,
 	apnsCertificatePassword string,
 	environment Environment,
+	logLevel logging.Level,
 ) (Config, error) {
 	c := Config{
 		nostrListenAddress:       nostrListenAddress,
@@ -48,6 +51,7 @@ func NewConfig(
 		apnsCertificatePath:      apnsCertificatePath,
 		apnsCertificatePassword:  apnsCertificatePassword,
 		environment:              environment,
+		logLevel:                 logLevel,
 	}
 
 	c.setDefaults()
@@ -90,6 +94,10 @@ func (c *Config) Environment() Environment {
 	return c.environment
 }
 
+func (c *Config) LogLevel() logging.Level {
+	return c.logLevel
+}
+
 func (c *Config) setDefaults() {
 	if c.nostrListenAddress == "" {
 		c.nostrListenAddress = ":8008"