-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from solumD/Task-7
Task 7
- Loading branch information
Showing
23 changed files
with
232 additions
and
18 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,5 @@ | |
| /bin | ||
| /coverage.out | ||
| /tls/ | ||
| /vendor.protogen | ||
| /vendor.protogen | ||
| /logs/ | ||
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
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 |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "errors" | ||
| "os" | ||
| ) | ||
|
|
||
| const ( | ||
| loggerLevelEnvName = "LOGGER_LEVEL" | ||
| ) | ||
|
|
||
| type loggerConfig struct { | ||
| level string | ||
| } | ||
|
|
||
| // NewLoggerConfig returns new grpc config | ||
| func NewLoggerConfig() (LoggerConfig, error) { | ||
| level := os.Getenv(loggerLevelEnvName) | ||
| if len(level) == 0 { | ||
| return nil, errors.New("logger level not found") | ||
| } | ||
|
|
||
| return &loggerConfig{ | ||
| level: level, | ||
| }, nil | ||
| } | ||
|
|
||
| // Level returns level of logger | ||
| func (cfg *loggerConfig) Level() string { | ||
| return cfg.level | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| package interceptor | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| "github.com/solumD/chat-server/internal/logger" | ||
|
|
||
| "go.uber.org/zap" | ||
| "google.golang.org/grpc" | ||
| ) | ||
|
|
||
| // LogInterceptor логирует содержание запроса | ||
| func LogInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) { | ||
| now := time.Now() | ||
|
|
||
| res, err := handler(ctx, req) | ||
| if err != nil { | ||
| logger.Error(err.Error(), zap.String("method", info.FullMethod), zap.Any("req", req)) | ||
| } | ||
|
|
||
| logger.Info("request", zap.String("method", info.FullMethod), zap.Any("req", req), zap.Any("res", res), zap.Duration("duration", time.Since(now))) | ||
|
|
||
| return res, err | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| package logger | ||
|
|
||
| import ( | ||
| "log" | ||
| "os" | ||
|
|
||
| "github.com/natefinch/lumberjack" | ||
| "go.uber.org/zap" | ||
| "go.uber.org/zap/zapcore" | ||
| ) | ||
|
|
||
| const ( | ||
| logsFilePath = "logs/app.log" | ||
| fileMegabytesMaxSize = 10 | ||
| fileMaxBackupsCount = 3 | ||
| fileMaxAge = 7 // days | ||
| ) | ||
|
|
||
| // GetCore возвращает настройки логгера | ||
| func GetCore(level zap.AtomicLevel) zapcore.Core { | ||
| stdout := zapcore.AddSync(os.Stdout) | ||
|
|
||
| file := zapcore.AddSync(&lumberjack.Logger{ | ||
| Filename: logsFilePath, | ||
| MaxSize: fileMegabytesMaxSize, | ||
| MaxBackups: fileMaxBackupsCount, | ||
| MaxAge: fileMaxAge, | ||
| }) | ||
|
|
||
| productionCfg := zap.NewProductionEncoderConfig() | ||
| productionCfg.TimeKey = "timestamp" | ||
| productionCfg.EncodeTime = zapcore.ISO8601TimeEncoder | ||
|
|
||
| developmentCfg := zap.NewDevelopmentEncoderConfig() | ||
| developmentCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder | ||
|
|
||
| consoleEncoder := zapcore.NewConsoleEncoder(developmentCfg) | ||
| fileEncoder := zapcore.NewJSONEncoder(productionCfg) | ||
|
|
||
| return zapcore.NewTee( | ||
| zapcore.NewCore(consoleEncoder, stdout, level), | ||
| zapcore.NewCore(fileEncoder, file, level), | ||
| ) | ||
| } | ||
|
|
||
| // GetAtomicLevel возвращает уровень логгирования | ||
| func GetAtomicLevel(logLevel string) zap.AtomicLevel { | ||
| var level zapcore.Level | ||
| if err := level.Set(logLevel); err != nil { | ||
| log.Fatalf("failed to set log level: %v", err) | ||
| } | ||
|
|
||
| return zap.NewAtomicLevelAt(level) | ||
| } | ||
|
|
||
| // MockInit инициализирует логгер для моков | ||
| func MockInit() { | ||
| globalLogger = zap.NewNop() | ||
| } |
Oops, something went wrong.