diff --git a/pkg/jsonconfig/eval.go b/pkg/jsonconfig/eval.go index 7d4fec937..bccb50681 100644 --- a/pkg/jsonconfig/eval.go +++ b/pkg/jsonconfig/eval.go @@ -84,17 +84,17 @@ func (c *ConfigParser) ReadFile(path string) (m map[string]interface{}, err erro // Decodes and evaluates a json config file, watching for include cycles. func (c *ConfigParser) recursiveReadJSON(configPath string) (decodedObject map[string]interface{}, err error) { - configPath, err = filepath.Abs(configPath) + absConfigPath, err := filepath.Abs(configPath) if err != nil { return nil, fmt.Errorf("Failed to expand absolute path for %s", configPath) } - if c.touchedFiles[configPath] { + if c.touchedFiles[absConfigPath] { return nil, fmt.Errorf("ConfigParser include cycle detected reading config: %v", - configPath) + absConfigPath) } - c.touchedFiles[configPath] = true + c.touchedFiles[absConfigPath] = true - c.includeStack.Push(configPath) + c.includeStack.Push(absConfigPath) defer c.includeStack.Pop() var f File diff --git a/server/appengine/config.json b/server/appengine/config.json index c35c66db7..d88c8f4f5 100644 --- a/server/appengine/config.json +++ b/server/appengine/config.json @@ -8,6 +8,7 @@ "handlerArgs": { "ownerName": "TODO:AppEngineOwnerName", "blobRoot": "/bs-and-maybe-also-index/", + "statusRoot": "/status/", "searchRoot": "/my-search/", "stealth": false } @@ -20,6 +21,10 @@ } }, + "/status/": { + "handler": "status" + }, + "/bs-and-maybe-also-index/": { "handler": "storage-cond", "handlerArgs": {