separate config logging section

Author: lomik

README.md

@@ -55,8 +55,6 @@ Create `/etc/graphite-clickhouse/graphite-clickhouse.conf`
 ```toml
 [common]
 listen = ":9090"
-logfile = "/var/log/graphite-clickhouse/graphite-clickhouse.log"
-loglevel = "info"
 max-cpu = 1
 
 [clickhouse]
@@ -70,6 +68,10 @@ rollup-conf = "/etc/graphite-clickhouse/rollup.xml"
 extra-prefix = ""
 data-timeout = "1m0s"
 tree-timeout = "1m0s"
+
+[logging]
+file = "/var/log/graphite-clickhouse/graphite-clickhouse.log"
+level = "info"
 ```
 
 ## Run on same host with graphite-web

config/config.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/BurntSushi/toml"
-	"github.com/uber-go/zap"
 
 	"github.com/lomik/graphite-clickhouse/helper/rollup"
 )
@@ -37,9 +36,7 @@ func (d *Duration) Value() time.Duration {
 }
 
 type Common struct {
-	Listen   string    `toml:"listen"`
-	LogFile  string    `toml:"logfile"`
-	LogLevel zap.Level `toml:"loglevel"`
+	Listen string `toml:"listen"`
 	// MetricPrefix   string    `toml:"metric-prefix"`
 	// MetricInterval *Duration `toml:"metric-interval"`
 	// MetricEndpoint string    `toml:"metric-endpoint"`
@@ -56,20 +53,24 @@ type ClickHouse struct {
 	ExtraPrefix string    `toml:"extra-prefix"`
 }
 
+type Logging struct {
+	File  string `toml:"file"`
+	Level string `toml:"level"`
+}
+
 // Config ...
 type Config struct {
 	Common     Common         `toml:"common"`
 	ClickHouse ClickHouse     `toml:"clickhouse"`
+	Logging    Logging        `toml:"logging"`
 	Rollup     *rollup.Rollup `toml:"-"`
 }
 
 // NewConfig ...
 func New() *Config {
 	cfg := &Config{
 		Common: Common{
-			Listen:   ":9090",
-			LogFile:  "/var/log/graphite-clickhouse/graphite-clickhouse.log",
-			LogLevel: zap.InfoLevel,
+			Listen: ":9090",
 			// MetricPrefix: "carbon.graphite-clickhouse.{host}",
 			// MetricInterval: &Duration{
 			// 	Duration: time.Minute,
@@ -90,6 +91,10 @@ func New() *Config {
 			},
 			RollupConf: "/etc/graphite-clickhouse/rollup.xml",
 		},
+		Logging: Logging{
+			File:  "/var/log/graphite-clickhouse/graphite-clickhouse.log",
+			Level: "info",
+		},
 	}
 
 	return cfg

graphite-clickhouse.go

@@ -108,17 +108,25 @@ func main() {
 	}
 	runtime.GOMAXPROCS(cfg.Common.MaxCPU)
 
-	zapOutput, err := zapwriter.New(cfg.Common.LogFile)
+	zapOutput, err := zapwriter.New(cfg.Logging.File)
 	if err != nil {
 		log.Fatal(err)
 	}
 
+	var logLevel zap.Level
+	if err = logLevel.UnmarshalText([]byte(cfg.Logging.Level)); err != nil {
+		log.Fatal(err)
+	}
+
+	dynamicLevel := zap.DynamicLevel()
+	dynamicLevel.SetLevel(logLevel)
+
 	logger := zap.New(
 		zapwriter.NewMixedEncoder(),
 		zap.AddCaller(),
 		zap.Output(zapOutput),
+		dynamicLevel,
 	)
-	logger.SetLevel(cfg.Common.LogLevel)
 
 	/* CONFIG end */