astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-23 22:16:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

logging: Add subsystem to log API (#19002)

Browse Source 
Create new code paths for multiple subsystems in the code. This will
make maintaing this easier later.

Also introduce bugLogIf() for errors that should not happen in the first
place.
This commit is contained in:
Anis Eleuch
2024-04-04 13:04:40 +01:00
committed by GitHub
parent 2228eb61cb
commit 95bf4a57b6
123 changed files with 972 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/config/identity/plugin/config.go
+5 -1
View File
@@ -38,6 +38,10 @@ import (
xnet "github.com/minio/pkg/v2/net"
)
func authNLogIf(ctx context.Context, err error) {
logger.LogIf(ctx, "authN", err)
}
// Authentication Plugin config and env variables
const (
URL = "url"
@@ -434,7 +438,7 @@ func (o *AuthNPlugin) checkConnectivity(ctx context.Context) bool {
req, err := http.NewRequestWithContext(ctx, http.MethodHead, u.String(), nil)
if err != nil {
logger.LogIf(ctx, err)
authNLogIf(ctx, err)
return false
}
internal/config/lambda/parse.go
+9 -1
View File
@@ -31,6 +31,14 @@ import (
xnet "github.com/minio/pkg/v2/net"
)
const (
logSubsys = "notify"
)
func logOnceIf(ctx context.Context, err error, id string, errKind ...interface{}) {
logger.LogOnceIf(ctx, logSubsys, err, id, errKind...)
}
// ErrTargetsOffline - Indicates single/multiple target failures.
var ErrTargetsOffline = errors.New("one or more targets are offline. Please use `mc admin info --json` to check the offline targets")
@@ -76,7 +84,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewWebhookTarget(ctx, id, args, logger.LogOnceIf, transport)
t, err := target.NewWebhookTarget(ctx, id, args, logOnceIf, transport)
if err != nil {
return nil, err
}
internal/config/notify/parse.go
+18 -10
View File
@@ -40,6 +40,14 @@ const (
formatNamespace = "namespace"
)
const (
logSubsys = "notify"
)
func logOnceIf(ctx context.Context, err error, id string, errKind ...interface{}) {
logger.LogOnceIf(ctx, logSubsys, err, id, errKind...)
}
// ErrTargetsOffline - Indicates single/multiple target failures.
var ErrTargetsOffline = errors.New("one or more targets are offline. Please use `mc admin info --json` to check the offline targets")
@@ -97,7 +105,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewAMQPTarget(id, args, logger.LogOnceIf)
t, err := target.NewAMQPTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -112,7 +120,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewElasticsearchTarget(id, args, logger.LogOnceIf)
t, err := target.NewElasticsearchTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -129,7 +137,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
continue
}
args.TLS.RootCAs = transport.TLSClientConfig.RootCAs
t, err := target.NewKafkaTarget(id, args, logger.LogOnceIf)
t, err := target.NewKafkaTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -147,7 +155,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
continue
}
args.RootCAs = transport.TLSClientConfig.RootCAs
t, err := target.NewMQTTTarget(id, args, logger.LogOnceIf)
t, err := target.NewMQTTTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -162,7 +170,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewMySQLTarget(id, args, logger.LogOnceIf)
t, err := target.NewMySQLTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -177,7 +185,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewNATSTarget(id, args, logger.LogOnceIf)
t, err := target.NewNATSTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -192,7 +200,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewNSQTarget(id, args, logger.LogOnceIf)
t, err := target.NewNSQTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -207,7 +215,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewPostgreSQLTarget(id, args, logger.LogOnceIf)
t, err := target.NewPostgreSQLTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -222,7 +230,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewRedisTarget(id, args, logger.LogOnceIf)
t, err := target.NewRedisTarget(id, args, logOnceIf)
if err != nil {
return nil, err
}
@@ -237,7 +245,7 @@ func fetchSubSysTargets(ctx context.Context, cfg config.Config, subSys string, t
if !args.Enable {
continue
}
t, err := target.NewWebhookTarget(ctx, id, args, logger.LogOnceIf, transport)
t, err := target.NewWebhookTarget(ctx, id, args, logOnceIf, transport)
if err != nil {
return nil, err
}
internal/config/storageclass/storage-class.go
+5 -1
View File
@@ -397,7 +397,7 @@ func LookupConfig(kvs config.KVS, setDriveCount int) (cfg Config, err error) {
return cfg, err
}
if inlineBlock > 128*humanize.KiByte {
logger.LogOnceIf(context.Background(), fmt.Errorf("inline block value bigger than recommended max of 128KiB -> %s, performance may degrade for PUT please benchmark the changes", inlineBlockStr), inlineBlockStr)
configLogOnceIf(context.Background(), fmt.Errorf("inline block value bigger than recommended max of 128KiB -> %s, performance may degrade for PUT please benchmark the changes", inlineBlockStr), inlineBlockStr)
}
cfg.inlineBlock = int64(inlineBlock)
} else {
@@ -408,3 +408,7 @@ func LookupConfig(kvs config.KVS, setDriveCount int) (cfg Config, err error) {
return cfg, nil
}
func configLogOnceIf(ctx context.Context, err error, id string, errKind ...interface{}) {
logger.LogOnceIf(ctx, "config", err, id, errKind...)
}