[#1619] logger: Set tags for ir
components
Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
parent
baee351f84
commit
3970121d9e
5 changed files with 25 additions and 12 deletions
|
@ -1,5 +1,6 @@
|
|||
FROSTFS_IR_LOGGER_LEVEL=info
|
||||
FROSTFS_IR_LOGGER_TIMESTAMP=true
|
||||
FROSTFS_IR_LOGGER_ALLOWED_TAGS="main:debug"
|
||||
|
||||
FROSTFS_IR_WALLET_PATH=/path/to/wallet.json
|
||||
FROSTFS_IR_WALLET_ADDRESS=NUHtW3eM6a4mmFCgyyr4rj4wygsTKB88XX
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
logger:
|
||||
level: info # Logger level: one of "debug", "info" (default), "warn", "error", "dpanic", "panic", "fatal"
|
||||
timestamp: true
|
||||
allowed_tags:
|
||||
- "main:debug" # Possible values: `main`, `morph`, `ir`, `processor`.
|
||||
|
||||
wallet:
|
||||
path: /path/to/wallet.json # Path to NEP-6 NEO wallet file
|
||||
|
|
|
@ -50,7 +50,7 @@ func (s *Server) initNetmapProcessor(ctx context.Context, cfg *viper.Viper,
|
|||
|
||||
var err error
|
||||
s.netmapProcessor, err = netmap.New(&netmap.Params{
|
||||
Log: s.log,
|
||||
Log: s.log.WithTag(logger.TagProcessor),
|
||||
Metrics: s.irMetrics,
|
||||
PoolSize: poolSize,
|
||||
NetmapClient: netmap.NewNetmapClient(s.netmapClient),
|
||||
|
@ -159,7 +159,7 @@ func (s *Server) createAlphaSync(cfg *viper.Viper, frostfsCli *frostfsClient.Cli
|
|||
} else {
|
||||
// create governance processor
|
||||
governanceProcessor, err := governance.New(&governance.Params{
|
||||
Log: s.log,
|
||||
Log: s.log.WithTag(logger.TagProcessor),
|
||||
Metrics: s.irMetrics,
|
||||
FrostFSClient: frostfsCli,
|
||||
AlphabetState: s,
|
||||
|
@ -225,7 +225,7 @@ func (s *Server) initAlphabetProcessor(ctx context.Context, cfg *viper.Viper) er
|
|||
// create alphabet processor
|
||||
s.alphabetProcessor, err = alphabet.New(&alphabet.Params{
|
||||
ParsedWallets: parsedWallets,
|
||||
Log: s.log,
|
||||
Log: s.log.WithTag(logger.TagProcessor),
|
||||
Metrics: s.irMetrics,
|
||||
PoolSize: poolSize,
|
||||
AlphabetContracts: s.contracts.alphabet,
|
||||
|
@ -247,7 +247,7 @@ func (s *Server) initContainerProcessor(ctx context.Context, cfg *viper.Viper, c
|
|||
s.log.Debug(ctx, logs.ContainerContainerWorkerPool, zap.Int("size", poolSize))
|
||||
// container processor
|
||||
containerProcessor, err := cont.New(&cont.Params{
|
||||
Log: s.log,
|
||||
Log: s.log.WithTag(logger.TagProcessor),
|
||||
Metrics: s.irMetrics,
|
||||
PoolSize: poolSize,
|
||||
AlphabetState: s,
|
||||
|
@ -268,7 +268,7 @@ func (s *Server) initBalanceProcessor(ctx context.Context, cfg *viper.Viper, fro
|
|||
s.log.Debug(ctx, logs.BalanceBalanceWorkerPool, zap.Int("size", poolSize))
|
||||
// create balance processor
|
||||
balanceProcessor, err := balance.New(&balance.Params{
|
||||
Log: s.log,
|
||||
Log: s.log.WithTag(logger.TagProcessor),
|
||||
Metrics: s.irMetrics,
|
||||
PoolSize: poolSize,
|
||||
FrostFSClient: frostfsCli,
|
||||
|
@ -291,7 +291,7 @@ func (s *Server) initFrostFSMainnetProcessor(ctx context.Context, cfg *viper.Vip
|
|||
s.log.Debug(ctx, logs.FrostFSFrostfsWorkerPool, zap.Int("size", poolSize))
|
||||
|
||||
frostfsProcessor, err := frostfs.New(&frostfs.Params{
|
||||
Log: s.log,
|
||||
Log: s.log.WithTag(logger.TagProcessor),
|
||||
Metrics: s.irMetrics,
|
||||
PoolSize: poolSize,
|
||||
FrostFSContract: s.contracts.frostfs,
|
||||
|
@ -342,7 +342,7 @@ func (s *Server) initGRPCServer(ctx context.Context, cfg *viper.Viper, log *logg
|
|||
|
||||
controlSvc := controlsrv.NewAuditService(controlsrv.New(p, s.netmapClient, s.containerClient,
|
||||
controlsrv.WithAllowedKeys(authKeys),
|
||||
), log, audit)
|
||||
), log.WithTag(logger.TagGrpcSvc), audit)
|
||||
|
||||
grpcControlSrv := grpc.NewServer()
|
||||
control.RegisterControlServiceServer(grpcControlSrv, controlSvc)
|
||||
|
@ -458,7 +458,7 @@ func (s *Server) initMorph(ctx context.Context, cfg *viper.Viper, errChan chan<-
|
|||
}
|
||||
|
||||
morphChain := &chainParams{
|
||||
log: s.log,
|
||||
log: s.log.WithTag(logger.TagMorph),
|
||||
cfg: cfg,
|
||||
key: s.key,
|
||||
name: morphPrefix,
|
||||
|
|
|
@ -339,7 +339,7 @@ func New(ctx context.Context, log *logger.Logger, cfg *viper.Viper, errChan chan
|
|||
) (*Server, error) {
|
||||
var err error
|
||||
server := &Server{
|
||||
log: log,
|
||||
log: log.WithTag(logger.TagIr),
|
||||
irMetrics: metrics,
|
||||
cmode: cmode,
|
||||
}
|
||||
|
|
|
@ -10,15 +10,25 @@ import (
|
|||
|
||||
const (
|
||||
TagMain uint8 = iota
|
||||
|
||||
tagMain = "main"
|
||||
TagMorph
|
||||
TagGrpcSvc
|
||||
TagIr
|
||||
TagProcessor
|
||||
)
|
||||
|
||||
// tagToMask return bit mask for the tag, encoded in uint32.
|
||||
func tagToMask(str string) (uint32, error) {
|
||||
switch str {
|
||||
case tagMain:
|
||||
case "main":
|
||||
return 1 << TagMain, nil
|
||||
case "morph":
|
||||
return 1 << TagMorph, nil
|
||||
case "grpc_svc":
|
||||
return 1 << TagGrpcSvc, nil
|
||||
case "ir":
|
||||
return 1 << TagIr, nil
|
||||
case "processor":
|
||||
return 1 << TagProcessor, nil
|
||||
default:
|
||||
return math.MaxUint32, fmt.Errorf("unsupported tag %s", str)
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue