Skip to content

Commit

Permalink
Remove syslogger and log everything to stdout
Browse files Browse the repository at this point in the history
Signed-off-by: Matias Pan <[email protected]>
  • Loading branch information
matipan committed Sep 4, 2024
1 parent 3ba0de2 commit b5802bd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 22 deletions.
9 changes: 1 addition & 8 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ func main() {

ctx, cancel := context.WithCancel(context.Background())

syslogHost := os.Getenv("SYSLOG_HOST")
if syslogHost == "" {
syslogHost = "127.0.0.1:514"
}

appName := os.Getenv("APP_NAME")
if appName == "" {
appName = "registry-redirect"
Expand All @@ -68,10 +63,9 @@ func main() {
Level: "info",
Component: appName,
Protocol: "tcp",
Address: syslogHost,
}

ctx, syslogger, err := logger.NewLogger(ctx, &logCfg)
ctx, err := logger.NewLogger(ctx, &logCfg)
if err != nil {
panic(err)
}
Expand All @@ -87,7 +81,6 @@ func main() {
if err := serve(ctx, logger); err != nil {
logger.Fatalf("failed to serve:+%v\n", err)
}
syslogger.Close()
}

func serve(ctx context.Context, logger *zap.SugaredLogger) (err error) {
Expand Down
20 changes: 6 additions & 14 deletions pkg/logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"encoding/json"
"fmt"
"os"

"github.com/chainguard-dev/registry-redirect/pkg/syslogger"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"knative.dev/pkg/logging"
Expand Down Expand Up @@ -34,18 +34,11 @@ func (c *Config) customConfigToKnativeConfig() (*logging.Config, error) {
}

// NewLogger creates a new logger with the given configuration.
func NewLogger(ctx context.Context, cfg *Config) (context.Context, *syslogger.SyslogWriter, error) {
syslogWriter := syslogger.NewSyslogWriter(cfg.Level, cfg.Protocol, cfg.Address, cfg.Component)

err := syslogWriter.Connect() // connect to syslog server
if err != nil {
return nil, nil, fmt.Errorf("failed to connect to syslog server: %v", err)
}

func NewLogger(ctx context.Context, cfg *Config) (context.Context, error) {
// Convert custom logging config to Knative logging config
knativeCfg, err := cfg.customConfigToKnativeConfig()
if err != nil {
return nil, nil, err
return nil, err
}

// Create a new Zap logger and atomic level from Knative logging config
Expand All @@ -59,9 +52,8 @@ func NewLogger(ctx context.Context, cfg *Config) (context.Context, *syslogger.Sy
// Create a new Core that writes to our SyslogWriter, uses JSON encoding, and has the same level as our original logger.
syslogCore := zapcore.NewCore(
zapcore.NewJSONEncoder(zap.NewProductionEncoderConfig()),

zapcore.AddSync(syslogWriter), // write to SyslogWriter
atomicLevel, // same level as the original logger
zapcore.AddSync(os.Stdout),
atomicLevel, // same level as the original logger
)

// Combine the original Core and our new Core. Logs written to the resulting Core will be written to both Cores.
Expand All @@ -73,5 +65,5 @@ func NewLogger(ctx context.Context, cfg *Config) (context.Context, *syslogger.Sy
// Update context with our combined logger. The logger is "sugared" again because it's typically more convenient to use.
ctx = logging.WithLogger(ctx, baseLogger.Sugar())

return ctx, syslogWriter, nil
return ctx, nil
}

0 comments on commit b5802bd

Please sign in to comment.