diff --git a/bin/slash/main.go b/bin/slash/main.go index 21cad17..9ec81de 100644 --- a/bin/slash/main.go +++ b/bin/slash/main.go @@ -3,6 +3,7 @@ package main import ( "context" "fmt" + "log/slog" "net/http" "os" "os/signal" @@ -10,9 +11,7 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "go.uber.org/zap" - "github.com/yourselfhosted/slash/internal/log" "github.com/yourselfhosted/slash/server" "github.com/yourselfhosted/slash/server/metric" "github.com/yourselfhosted/slash/server/profile" @@ -41,12 +40,12 @@ var ( dbDriver, err := db.NewDBDriver(serverProfile) if err != nil { cancel() - log.Error("failed to create db driver", zap.Error(err)) + slog.Error("failed to create db driver", err) return } if err := dbDriver.Migrate(ctx); err != nil { cancel() - log.Error("failed to migrate db", zap.Error(err)) + slog.Error("failed to migrate db", err) return } @@ -54,7 +53,7 @@ var ( s, err := server.NewServer(ctx, serverProfile, storeInstance) if err != nil { cancel() - log.Error("failed to create server", zap.Error(err)) + slog.Error("failed to create server", err) return } @@ -70,7 +69,7 @@ var ( signal.Notify(c, os.Interrupt, syscall.SIGTERM) go func() { sig := <-c - log.Info(fmt.Sprintf("%s received.\n", sig.String())) + slog.Info(fmt.Sprintf("%s received.\n", sig.String())) s.Shutdown(ctx) cancel() }() @@ -79,7 +78,7 @@ var ( if err := s.Start(ctx); err != nil { if err != http.ErrServerClosed { - log.Error("failed to start server", zap.Error(err)) + slog.Error("failed to start server", err) cancel() } } @@ -91,7 +90,6 @@ var ( ) func Execute() error { - defer log.Sync() return rootCmd.Execute() } @@ -142,7 +140,7 @@ func initConfig() { var err error serverProfile, err = profile.GetProfile() if err != nil { - log.Error("failed to get profile", zap.Error(err)) + slog.Error("failed to get profile", err) return } diff --git a/go.mod b/go.mod index c3f4f09..e8b15ba 100644 --- a/go.mod +++ b/go.mod @@ -76,7 +76,6 @@ require ( github.com/patrickmn/go-cache v2.1.0+incompatible github.com/pkg/errors v0.9.1 github.com/posthog/posthog-go v0.0.0-20240221135834-4944045455b4 - go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 golang.org/x/mod v0.16.0 google.golang.org/genproto/googleapis/api v0.0.0-20240304212257-790db918fca8 diff --git a/go.sum b/go.sum index 210c069..b98f888 100644 --- a/go.sum +++ b/go.sum @@ -398,8 +398,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= -go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -407,8 +405,6 @@ go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN8 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= -go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= diff --git a/internal/log/logger.go b/internal/log/logger.go deleted file mode 100644 index c839521..0000000 --- a/internal/log/logger.go +++ /dev/null @@ -1,66 +0,0 @@ -package log - -import ( - "go.uber.org/zap" - "go.uber.org/zap/zapcore" -) - -var ( - // `gl` is the global logger. - // Other packages should use public methods such as Info/Error to do the logging. - // For other types of logging, e.g. logging to a separate file, they should use their own loggers. - gl *zap.Logger - gLevel zap.AtomicLevel -) - -// Initializes the global console logger. -func init() { - gLevel = zap.NewAtomicLevelAt(zap.InfoLevel) - gl, _ = zap.Config{ - Level: gLevel, - Development: true, - // Use "console" to print readable stacktrace. - Encoding: "console", - EncoderConfig: zap.NewDevelopmentEncoderConfig(), - OutputPaths: []string{"stderr"}, - ErrorOutputPaths: []string{"stderr"}, - }.Build( - // Skip one caller stack to locate the correct caller. - zap.AddCallerSkip(1), - ) -} - -// SetLevel wraps the zap Level's SetLevel method. -func SetLevel(level zapcore.Level) { - gLevel.SetLevel(level) -} - -// EnabledLevel wraps the zap Level's Enabled method. -func EnabledLevel(level zapcore.Level) bool { - return gLevel.Enabled(level) -} - -// Debug wraps the zap Logger's Debug method. -func Debug(msg string, fields ...zap.Field) { - gl.Debug(msg, fields...) -} - -// Info wraps the zap Logger's Info method. -func Info(msg string, fields ...zap.Field) { - gl.Info(msg, fields...) -} - -// Warn wraps the zap Logger's Warn method. -func Warn(msg string, fields ...zap.Field) { - gl.Warn(msg, fields...) -} - -// Error wraps the zap Logger's Error method. -func Error(msg string, fields ...zap.Field) { - gl.Error(msg, fields...) -} - -// Sync wraps the zap Logger's Sync method. -func Sync() { - _ = gl.Sync() -} diff --git a/server/server.go b/server/server.go index a554408..4153756 100644 --- a/server/server.go +++ b/server/server.go @@ -11,9 +11,7 @@ import ( "github.com/google/uuid" "github.com/labstack/echo/v4" "github.com/pkg/errors" - "go.uber.org/zap" - "github.com/yourselfhosted/slash/internal/log" storepb "github.com/yourselfhosted/slash/proto/gen/store" "github.com/yourselfhosted/slash/server/metric" "github.com/yourselfhosted/slash/server/profile" @@ -88,7 +86,7 @@ func NewServer(ctx context.Context, profile *profile.Profile, store *store.Store func (s *Server) Start(ctx context.Context) error { // Load subscription. if _, err := s.licenseService.LoadSubscription(ctx); err != nil { - log.Error("failed to load subscription", zap.Error(err)) + slog.Error("failed to load subscription", err) } // Start gRPC server. listen, err := net.Listen("tcp", fmt.Sprintf(":%d", s.Profile.Port+1))