-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Ales Verbic <verbotenj@blinklabs.io>
- Loading branch information
Showing
9 changed files
with
144 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,58 +1,89 @@ | ||
| // Copyright 2024 Blink Labs Software | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package logging | ||
|
|
||
| import ( | ||
| "log" | ||
| "log/slog" | ||
| "os" | ||
| "time" | ||
|
|
||
| "github.com/blinklabs-io/bursa/internal/config" | ||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
| ) | ||
|
|
||
| type Logger = zap.SugaredLogger | ||
|
|
||
| var globalLogger *Logger | ||
| var globalLogger *slog.Logger | ||
| var accessLogger *slog.Logger | ||
|
|
||
| func Setup() { | ||
| // Configure initializes the global logger. | ||
| func Configure() { | ||
| cfg := config.GetConfig() | ||
| // Build our custom logging config | ||
| loggerConfig := zap.NewProductionConfig() | ||
| // Change timestamp key name | ||
| loggerConfig.EncoderConfig.TimeKey = "timestamp" | ||
| // Use a human readable time format | ||
| loggerConfig.EncoderConfig.EncodeTime = zapcore.TimeEncoderOfLayout( | ||
| time.RFC3339, | ||
| ) | ||
|
|
||
| // Set level | ||
| if cfg.Logging.Level != "" { | ||
| level, err := zapcore.ParseLevel(cfg.Logging.Level) | ||
| if err != nil { | ||
| log.Fatalf("error configuring logger: %s", err) | ||
| } | ||
| loggerConfig.Level.SetLevel(level) | ||
| var level slog.Level | ||
| switch cfg.Logging.Level { | ||
| case "debug": | ||
| level = slog.LevelDebug | ||
| case "info": | ||
| level = slog.LevelInfo | ||
| case "warn": | ||
| level = slog.LevelWarn | ||
| case "error": | ||
| level = slog.LevelError | ||
| default: | ||
| level = slog.LevelInfo | ||
| } | ||
|
|
||
| // Create the logger | ||
| l, err := loggerConfig.Build() | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| handler := slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{ | ||
| ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr { | ||
| if a.Key == slog.TimeKey { | ||
| return slog.String( | ||
| "timestamp", | ||
| a.Value.Time().Format(time.RFC3339), | ||
| ) | ||
| } | ||
| return a | ||
| }, | ||
| Level: level, | ||
| }) | ||
| globalLogger = slog.New(handler).With("component", "main") | ||
|
|
||
| // Store the "sugared" version of the logger | ||
| globalLogger = l.Sugar() | ||
| // Configure access logger | ||
| accessHandler := slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{ | ||
| ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr { | ||
| if a.Key == slog.TimeKey { | ||
| return slog.String( | ||
| "timestamp", | ||
| a.Value.Time().Format(time.RFC3339), | ||
| ) | ||
| } | ||
| return a | ||
| }, | ||
| Level: slog.LevelInfo, | ||
| }) | ||
| accessLogger = slog.New(accessHandler).With("component", "access") | ||
| } | ||
|
|
||
| func GetLogger() *Logger { | ||
| // GetLogger returns the global application logger. | ||
| func GetLogger() *slog.Logger { | ||
| if globalLogger == nil { | ||
| Configure() | ||
| } | ||
| return globalLogger | ||
| } | ||
|
|
||
| func GetDesugaredLogger() *zap.Logger { | ||
| return globalLogger.Desugar() | ||
| } | ||
|
|
||
| func GetAccessLogger() *zap.Logger { | ||
| return globalLogger.Desugar(). | ||
| With(zap.String("type", "access")). | ||
| WithOptions(zap.WithCaller(false)) | ||
| // GetAccessLogger returns the access logger. | ||
| func GetAccessLogger() *slog.Logger { | ||
| if accessLogger == nil { | ||
| Configure() | ||
| } | ||
| return accessLogger | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters