From 2feb852ce0a5d29f9ad9c5cb5329de3ce00e7955 Mon Sep 17 00:00:00 2001 From: bricelalu Date: Wed, 31 Mar 2021 11:34:14 +0200 Subject: feat: [Logger] add clean mode --- plugins/logger/config.go | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'plugins') diff --git a/plugins/logger/config.go b/plugins/logger/config.go index 52594bc4..284ab6ea 100644 --- a/plugins/logger/config.go +++ b/plugins/logger/config.go @@ -50,6 +50,16 @@ func (cfg *Config) BuildLogger() (*zap.Logger, error) { zCfg = zap.NewProductionConfig() case "development": zCfg = zap.NewDevelopmentConfig() + case "clean": + zCfg = zap.Config{ + Level: zap.NewAtomicLevelAt(zap.DebugLevel), + Encoding: "console", + EncoderConfig: zapcore.EncoderConfig{ + MessageKey: "message", + }, + OutputPaths: []string{"stderr"}, + ErrorOutputPaths: []string{"stderr"}, + } default: zCfg = zap.Config{ Level: zap.NewAtomicLevelAt(zap.DebugLevel), -- cgit v1.2.3 From 68a8cd78ba52f90ae263e970fbfa8920207e8b5d Mon Sep 17 00:00:00 2001 From: bricelalu Date: Sat, 3 Apr 2021 16:26:48 +0200 Subject: test: [Logger] add test for raw mode Signed-off-by: bricelalu --- plugins/logger/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/logger/config.go b/plugins/logger/config.go index 284ab6ea..bfe45f78 100644 --- a/plugins/logger/config.go +++ b/plugins/logger/config.go @@ -50,7 +50,7 @@ func (cfg *Config) BuildLogger() (*zap.Logger, error) { zCfg = zap.NewProductionConfig() case "development": zCfg = zap.NewDevelopmentConfig() - case "clean": + case "raw": zCfg = zap.Config{ Level: zap.NewAtomicLevelAt(zap.DebugLevel), Encoding: "console", -- cgit v1.2.3 From 0c22e732703a672e3728d6a7db476955fb661fc9 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Wed, 31 Mar 2021 18:58:03 +0300 Subject: - Config: Add the ability to pass General config options to any plugin --- plugins/config/config.go | 10 ++++++++++ plugins/config/interface.go | 3 +++ plugins/config/plugin.go | 7 +++++++ 3 files changed, 20 insertions(+) create mode 100644 plugins/config/config.go (limited to 'plugins') diff --git a/plugins/config/config.go b/plugins/config/config.go new file mode 100644 index 00000000..b5807921 --- /dev/null +++ b/plugins/config/config.go @@ -0,0 +1,10 @@ +package config + +import "time" + +// General is the part of the config plugin which contains general for the whole RR2 parameters +// For example - http timeouts, headers sizes etc and also graceful shutdown timeout should be the same across whole application +type General struct { + // GracefulTimeout for the temporal and http + GracefulTimeout time.Duration +} diff --git a/plugins/config/interface.go b/plugins/config/interface.go index 23279f53..8370c0ab 100644 --- a/plugins/config/interface.go +++ b/plugins/config/interface.go @@ -23,4 +23,7 @@ type Configurer interface { // Has checks if config section exists. Has(name string) bool + + // Returns General section. Read-only + GetCommonConfig() *General } diff --git a/plugins/config/plugin.go b/plugins/config/plugin.go index a01a32b3..09fd35bb 100755 --- a/plugins/config/plugin.go +++ b/plugins/config/plugin.go @@ -19,6 +19,8 @@ type Viper struct { // user defined Flags in the form of