Skip to content

Commit

Permalink
Merge pull request #1082 from ahmethakanbesel/fix/logging-error-format
Browse files Browse the repository at this point in the history
fix: `slog` `!BADKEY` errors
  • Loading branch information
tolgaOzen committed Feb 25, 2024
2 parents bfe03f4 + e48e414 commit e7892b0
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions internal/servers/server.go
Expand Up @@ -220,7 +220,7 @@ func (s *Container) Run(
if err := pprofserver.ListenAndServe(); err != nil {
// Check if the error was due to the server being closed, and log it.
if errors.Is(err, http.ErrServerClosed) {
slog.Error("failed to start profiler", err)
slog.Error("failed to start profiler", slog.Any("error", err))
}
}
}()
Expand All @@ -241,13 +241,13 @@ func (s *Container) Run(
// Start the gRPC server.
go func() {
if err := grpcServer.Serve(lis); err != nil {
slog.Error("failed to start grpc server", err)
slog.Error("failed to start grpc server", slog.Any("error", err))
}
}()

go func() {
if err := invokeServer.Serve(invokeLis); err != nil {
slog.Error("failed to start invoke grpc server", err)
slog.Error("failed to start invoke grpc server", slog.Any("error", err))
}
}()

Expand Down Expand Up @@ -282,7 +282,7 @@ func (s *Container) Run(
}
defer func() {
if err = conn.Close(); err != nil {
slog.Error("Failed to close gRPC connection: %v", err)
slog.Error("Failed to close gRPC connection", slog.Any("error", err))
}
}()

Expand Down
12 changes: 6 additions & 6 deletions internal/storage/postgres/gc/gc.go
Expand Up @@ -53,7 +53,7 @@ func (gc *GC) Start(ctx context.Context) error {
select {
case <-ticker.C: // Periodically trigger garbage collection.
if err := gc.Run(); err != nil {
slog.Error("Garbage collection failed:", err)
slog.Error("Garbage collection failed:", slog.Any("error", err))
continue
} else {
slog.Info("Garbage collection completed successfully")
Expand All @@ -73,7 +73,7 @@ func (gc *GC) Run() error {
var dbNow time.Time
err := gc.database.DB.QueryRowContext(ctx, "SELECT NOW() AT TIME ZONE 'UTC'").Scan(&dbNow)
if err != nil {
slog.Error("Failed to get current time from the database:", err)
slog.Error("Failed to get current time from the database:", slog.Any("error", err))
return err
}

Expand All @@ -83,7 +83,7 @@ func (gc *GC) Run() error {
// Retrieve the last transaction ID that occurred before the cutoff time.
lastTransactionID, err := gc.getLastTransactionID(ctx, cutoffTime)
if err != nil {
slog.Error("Failed to retrieve last transaction ID:", err)
slog.Error("Failed to retrieve last transaction ID:", slog.Any("error", err))
return err
}

Expand All @@ -93,15 +93,15 @@ func (gc *GC) Run() error {

// Delete records in relation_tuples, attributes, and transactions tables based on the lastTransactionID.
if err := gc.deleteRecords(ctx, postgres.RelationTuplesTable, lastTransactionID); err != nil {
slog.Error("Failed to delete records in relation_tuples:", err)
slog.Error("Failed to delete records in relation_tuples:", slog.Any("error", err))
return err
}
if err := gc.deleteRecords(ctx, postgres.AttributesTable, lastTransactionID); err != nil {
slog.Error("Failed to delete records in attributes:", err)
slog.Error("Failed to delete records in attributes:", slog.Any("error", err))
return err
}
if err := gc.deleteTransactions(ctx, lastTransactionID); err != nil {
slog.Error("Failed to delete transactions:", err)
slog.Error("Failed to delete transactions:", slog.Any("error", err))
return err
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/serve.go
Expand Up @@ -137,19 +137,19 @@ func serve() func(cmd *cobra.Command, args []string) error {
if cfg.Database.AutoMigrate {
err = storage.Migrate(cfg.Database)
if err != nil {
slog.Error("failed to migrate database: %w", err)
slog.Error("failed to migrate database", slog.Any("error", err))
}
}

// Initialize database
db, err := factories.DatabaseFactory(cfg.Database)
if err != nil {
slog.Error("failed to initialize database: %w", err)
slog.Error("failed to initialize database", slog.Any("error", err))
return err
}
defer func() {
if err = db.Close(); err != nil {
slog.Error("failed to close database: %v", err)
slog.Error("failed to close database", slog.Any("error", err))
}
}()

Expand Down

0 comments on commit e7892b0

Please sign in to comment.