mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-04-15 21:07:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #825 from rhafer/nats-disable-tracelog

Browse Source 
nats: Don't enable debug and trace logging by default
This commit is contained in:
Ralf Haferkamp
2025-05-13 09:50:17 +02:00
committed by GitHub
parent f0971d9fe4 4d52257558
commit d7c87a0dd5
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/nats/pkg/command/server.go
View File

@@ -78,7 +78,7 @@ func Server(cfg *config.Config) *cli.Command {
}
natsServer, err := nats.NewNATSServer(
ctx,
logging.NewLogWrapper(logger),
logger,
nats.Host(cfg.Nats.Host),
nats.Port(cfg.Nats.Port),
nats.ClusterID(cfg.Nats.ClusterID),

8
services/nats/pkg/server/nats/nats.go
View File

@@ -5,6 +5,9 @@ import (
"time"
nserver "github.com/nats-io/nats-server/v2/server"
"github.com/opencloud-eu/opencloud/pkg/log"
"github.com/opencloud-eu/opencloud/services/nats/pkg/logging"
"github.com/rs/zerolog"
)
var NATSListenAndServeLoopTimer = 1 * time.Second
@@ -15,7 +18,7 @@ type NATSServer struct {
}
// NatsOption configures the new NATSServer instance
func NewNATSServer(ctx context.Context, logger nserver.Logger, opts ...NatsOption) (*NATSServer, error) {
func NewNATSServer(ctx context.Context, logger log.Logger, opts ...NatsOption) (*NATSServer, error) {
natsOpts := &nserver.Options{}
for _, o := range opts {
@@ -32,7 +35,8 @@ func NewNATSServer(ctx context.Context, logger nserver.Logger, opts ...NatsOptio
return nil, err
}
server.SetLoggerV2(logger, true, true, false)
nLogger := logging.NewLogWrapper(logger)
server.SetLoggerV2(nLogger, logger.GetLevel() <= zerolog.DebugLevel, logger.GetLevel() <= zerolog.TraceLevel, false)
return &NATSServer{
ctx: ctx,