Merge branch 'dev' into 'staging'
feat: logger to app See merge request external/treasurer!8
This commit is contained in:
commit
ce0a7c8e4c
@ -1,11 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"context"
|
|
||||||
"errors"
|
|
||||||
"log"
|
"log"
|
||||||
"os/signal"
|
|
||||||
"syscall"
|
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"penahub.gitlab.yandexcloud.net/external/treasurer/internal/app"
|
"penahub.gitlab.yandexcloud.net/external/treasurer/internal/app"
|
||||||
@ -13,27 +9,17 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
|
||||||
logger, err := zap.NewProduction(zap.AddStacktrace(zap.DPanicLevel))
|
logger, err := zap.NewProduction(zap.AddStacktrace(zap.DPanicLevel))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatalf("failed to init zap logger: %v", err)
|
log.Fatalf("failed to init zap logger: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
defer cancel()
|
|
||||||
defer func() {
|
|
||||||
if syncErr := logger.Sync(); syncErr != nil {
|
|
||||||
if !errors.Is(syncErr, syscall.EBADF) && !errors.Is(syncErr, syscall.ENOTTY) {
|
|
||||||
log.Fatalf("failed to sync zap logger: %v", syncErr)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}()
|
|
||||||
|
|
||||||
config, err := initialize.Configuration(".env.test")
|
config, err := initialize.Configuration(".env.test")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logger.Fatal("failed to init config: %v", zap.Error(err))
|
logger.Fatal("failed to init config: %v", zap.Error(err))
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := app.Run(ctx, config, logger); err != nil {
|
if err := app.Run(config, logger); err != nil {
|
||||||
logger.Fatal("failed to run app: %v", zap.Error(err))
|
logger.Fatal("failed to run app: %v", zap.Error(err))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,6 +4,8 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"os/signal"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
@ -20,7 +22,7 @@ const (
|
|||||||
shutdownTimeout = 5 * time.Second
|
shutdownTimeout = 5 * time.Second
|
||||||
)
|
)
|
||||||
|
|
||||||
func Run(ctx context.Context, config *models.Config, logger *zap.Logger) (appErr error) {
|
func Run(config *models.Config, logger *zap.Logger) (appErr error) {
|
||||||
defer func() {
|
defer func() {
|
||||||
if recovered := recover(); recovered != nil {
|
if recovered := recover(); recovered != nil {
|
||||||
appErr = errors.New("recovered panic on application run")
|
appErr = errors.New("recovered panic on application run")
|
||||||
@ -28,6 +30,9 @@ func Run(ctx context.Context, config *models.Config, logger *zap.Logger) (appErr
|
|||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
mongoDB, connectionErr := mongo.Connect(ctx, &mongo.ConnectDeps{
|
mongoDB, connectionErr := mongo.Connect(ctx, &mongo.ConnectDeps{
|
||||||
Configuration: &config.Database,
|
Configuration: &config.Database,
|
||||||
Timeout: 10 * time.Second,
|
Timeout: 10 * time.Second,
|
||||||
|
Loading…
Reference in New Issue
Block a user