recover rollup parser #9

lomik · lomik · commit 421305f9ed05 · 2017-07-12T21:39:36.000+03:00
diff --git a/config/config.go b/config/config.go
@@ -172,9 +172,17 @@ func ReadConfig(filename string) (*Config, error) {
 		return nil, err
 	}
 
+	rollupConfBody, err := ioutil.ReadFile(cfg.ClickHouse.RollupConf)
 	if err != nil {
 		return nil, err
 	}
 
+	r, err := rollup.ParseXML(rollupConfBody)
+	if err != nil {
+		return nil, err
+	}
+
+	cfg.Rollup = r
+
 	return cfg, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -172,9 +172,17 @@ func ReadConfig(filename string) (*Config, error) {`
`172`	`172`	`return nil, err`
`173`	`173`	`}`
`174`	`174`
	`175`	`+ rollupConfBody, err := ioutil.ReadFile(cfg.ClickHouse.RollupConf)`
`175`	`176`	`if err != nil {`
`176`	`177`	`return nil, err`
`177`	`178`	`}`
`178`	`179`
	`180`	`+ r, err := rollup.ParseXML(rollupConfBody)`
	`181`	`+ if err != nil {`
	`182`	`+ return nil, err`
	`183`	`+ }`
	`184`	`+`
	`185`	`+ cfg.Rollup = r`
	`186`	`+`
`179`	`187`	`return cfg, nil`
`180`	`188`	`}`