load log level in processor app, add config in stats

cmd/vega/node_pre.go

@@ -146,7 +146,7 @@ func (l *NodeCommand) persistentPre(_ *cobra.Command, args []string) (err error)
 			logging.Uint64("nofile", l.conf.UlimitNOFile))
 	}
 
-	l.stats = stats.New(l.Log, l.cli.version, l.cli.versionHash)
+	l.stats = stats.New(l.Log, l.conf.Stats, l.cli.version, l.cli.versionHash)
 
 	// set up storage, this should be persistent
 	if err := l.setupStorages(); err != nil {
@@ -272,6 +272,7 @@ func (l *NodeCommand) setupStorages() (err error) {
 		func(cfg config.Config) { l.riskStore.ReloadConf(cfg.Storage) },
 		func(cfg config.Config) { l.marketDataStore.ReloadConf(cfg.Storage) },
 		func(cfg config.Config) { l.marketStore.ReloadConf(cfg.Storage) },
+		func(cfg config.Config) { l.stats.ReloadConf(cfg.Stats) },
 	)
 
 	return
@@ -552,6 +553,7 @@ func (l *NodeCommand) preRun(_ *cobra.Command, _ []string) (err error) {
 		func(cfg config.Config) { l.banking.ReloadConf(cfg.Banking) },
 		func(cfg config.Config) { l.governance.ReloadConf(cfg.Governance) },
 		func(cfg config.Config) { l.nodeWallet.ReloadConf(cfg.NodeWallet) },
+		func(cfg config.Config) { app.ReloadConf(cfg.Processor) },
 
 		// services
 		func(cfg config.Config) { l.candleService.ReloadConf(cfg.Candles) },

config/config.go

@@ -30,6 +30,7 @@ import (
 	"code.vegaprotocol.io/vega/processor"
 	"code.vegaprotocol.io/vega/risk"
 	"code.vegaprotocol.io/vega/settlement"
+	"code.vegaprotocol.io/vega/stats"
 	"code.vegaprotocol.io/vega/storage"
 	"code.vegaprotocol.io/vega/subscribers"
 	"code.vegaprotocol.io/vega/trades"
@@ -73,6 +74,7 @@ type Config struct {
 	Genesis     genesis.Config
 	Validators  validators.Config
 	Banking     banking.Config
+	Stats       stats.Config
 
 	Pprof          pprof.Config
 	GatewayEnabled bool
@@ -115,6 +117,7 @@ func NewDefaultConfig(defaultStoreDirPath string) Config {
 		Genesis:        genesis.NewDefaultConfig(),
 		Validators:     validators.NewDefaultConfig(),
 		Banking:        banking.NewDefaultConfig(),
+		Stats:          stats.NewDefaultConfig(),
 		Subscribers:    subscribers.NewDefaultConfig(),
 		GatewayEnabled: true,
 		StoresEnabled:  true,

processor/abci.go

@@ -28,7 +28,7 @@ type App struct {
 	hasRegistered     bool
 	size              uint64
 
-	Config
+	cfg      Config
 	log      *logging.Logger
 	cancelFn func()
 	idGen    *IDgenerator
@@ -71,6 +71,9 @@ func NewApp(
 	top ValidatorTopology,
 	wallet Wallet,
 ) (*App, error) {
+	log = log.Named(namedLogger)
+	log.SetLevel(config.Level.Get())
+
 	vegaWallet, ok := wallet.Get(nodewallet.Vega)
 	if !ok {
 		return nil, ErrVegaWalletRequired
@@ -80,7 +83,7 @@ func NewApp(
 		abci: abci.New(&codec{}),
 
 		log:      log,
-		Config:   config,
+		cfg:      config,
 		cancelFn: cancelFn,
 		idGen:    NewIDGen(),
 
@@ -127,6 +130,20 @@ func NewApp(
 	return app, nil
 }
 
+// ReloadConf updates the internal configuration
+func (a *App) ReloadConf(cfg Config) {
+	a.log.Info("reloading configuration")
+	if a.log.GetLevel() != cfg.Level.Get() {
+		a.log.Info("updating log level",
+			logging.String("old", a.log.GetLevel().String()),
+			logging.String("new", cfg.Level.String()),
+		)
+		a.log.SetLevel(cfg.Level.Get())
+	}
+
+	a.cfg = cfg
+}
+
 func (app *App) Abci() *abci.App {
 	return app.abci
 }
@@ -319,7 +336,7 @@ func (app *App) DeliverCancelOrder(ctx context.Context, tx abci.Tx) error {
 		app.log.Error("error on cancelling order", logging.String("order-id", order.OrderID), logging.Error(err))
 		return err
 	}
-	if app.LogOrderCancelDebug {
+	if app.cfg.LogOrderCancelDebug {
 		for _, v := range msg {
 			app.log.Debug("Order cancelled", logging.Order(*v.Order))
 		}
@@ -343,7 +360,7 @@ func (app *App) DeliverAmendOrder(ctx context.Context, tx abci.Tx) error {
 		app.log.Error("error on amending order", logging.String("order-id", order.OrderID), logging.Error(err))
 		return err
 	}
-	if app.LogOrderAmendDebug {
+	if app.cfg.LogOrderAmendDebug {
 		app.log.Debug("Order amended", logging.Order(*msg.Order))
 	}
 

stats/config.go

@@ -0,0 +1,23 @@
+package stats
+
+import (
+	"code.vegaprotocol.io/vega/config/encoding"
+	"code.vegaprotocol.io/vega/logging"
+)
+
+const (
+	namedLogger = "stats"
+)
+
+// Config represent the configuration
+type Config struct {
+	Level encoding.LogLevel
+}
+
+// NewDefaultConfig creates an instance of the package specific configuration, given a
+// pointer to a logger instance to be used for logging within the package.
+func NewDefaultConfig() Config {
+	return Config{
+		Level: encoding.LogLevel{Level: logging.InfoLevel},
+	}
+}

stats/stats.go

@@ -9,6 +9,7 @@ import (
 // Stats ties together all other package level application stats types.
 type Stats struct {
 	log          *logging.Logger
+	cfg          Config
 	Blockchain   *Blockchain
 	version      string
 	versionHash  string
@@ -17,16 +18,33 @@ type Stats struct {
 }
 
 // New instantiates a new Stats
-func New(logger *logging.Logger, version string, versionHash string) *Stats {
+func New(log *logging.Logger, cfg Config, version string, versionHash string) *Stats {
+	log = log.Named(namedLogger)
+	log.SetLevel(cfg.Level.Get())
 	return &Stats{
-		log:         logger,
+		log:         log,
+		cfg:         cfg,
 		Blockchain:  &Blockchain{},
 		version:     version,
 		versionHash: versionHash,
 		uptime:      time.Now(),
 	}
 }
 
+// ReloadConf updates the internal configuration
+func (s *Stats) ReloadConf(cfg Config) {
+	s.log.Info("reloading configuration")
+	if s.log.GetLevel() != cfg.Level.Get() {
+		s.log.Info("updating log level",
+			logging.String("old", s.log.GetLevel().String()),
+			logging.String("new", cfg.Level.String()),
+		)
+		s.log.SetLevel(cfg.Level.Get())
+	}
+
+	s.cfg = cfg
+}
+
 // SetChainVersion sets the version of the chain in use by vega
 func (s *Stats) SetChainVersion(v string) {
 	s.chainVersion = v