Merge pull request #1331 from bosun-monitor/placeholders

Craig Peterson · Craig Peterson · commit 9ef650b36b5d · 2015-09-18T08:38:32.000-06:00
a few simple placeholder conf items to ease timing on future migration.
diff --git a/cmd/bosun/conf/conf.go b/cmd/bosun/conf/conf.go
@@ -494,6 +494,8 @@ func (c *Conf) loadGlobal(p *parse.PairNode) {
 		}
 	case "shortURLKey":
 		c.ShortURLKey = v
+	case "ledisDir", "redisHost":
+		return //placeholders to allow easier migration in the future.
 	default:
 		if !strings.HasPrefix(k, "$") {
 			c.errorf("unknown key %s", k)

Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,8 @@ func (c Conf) loadGlobal(p parse.PairNode) {`
`494`	`494`	`}`
`495`	`495`	`case "shortURLKey":`
`496`	`496`	`c.ShortURLKey = v`
	`497`	`+ case "ledisDir", "redisHost":`
	`498`	`+ return //placeholders to allow easier migration in the future.`
`497`	`499`	`default:`
`498`	`500`	`if !strings.HasPrefix(k, "$") {`
`499`	`501`	`c.errorf("unknown key %s", k)`