diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-10-23 08:38:15 -0700 |
| commit | 028657b43ed7d6e2b0adca322e2d47781c1b3eb4 (patch) | |
| tree | 7366462741ae8f980f8066d1daa8166ae8a3c17b /api/admin.go | |
| parent | 009982cd4514c6f0950138b15367df559c8f4dd2 (diff) | |
| parent | 0cf24be0662fb9ee2a3b52bfb8c3903bc8c32b72 (diff) | |
| download | chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.gz chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.tar.bz2 chat-028657b43ed7d6e2b0adca322e2d47781c1b3eb4.zip | |
Merge branch 'master' into PLT-25
Diffstat (limited to 'api/admin.go')
| -rw-r--r-- | api/admin.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/api/admin.go b/api/admin.go index 89353d61d..8e0a03e4b 100644 --- a/api/admin.go +++ b/api/admin.go @@ -24,7 +24,7 @@ func InitAdmin(r *mux.Router) { sr.Handle("/config", ApiUserRequired(getConfig)).Methods("GET") sr.Handle("/save_config", ApiUserRequired(saveConfig)).Methods("POST") sr.Handle("/test_email", ApiUserRequired(testEmail)).Methods("POST") - sr.Handle("/client_props", ApiAppHandler(getClientProperties)).Methods("GET") + sr.Handle("/client_props", ApiAppHandler(getClientConfig)).Methods("GET") sr.Handle("/log_client", ApiAppHandler(logClient)).Methods("POST") sr.Handle("/analytics/{id:[A-Za-z0-9]+}/{name:[A-Za-z0-9_]+}", ApiAppHandler(getAnalytics)).Methods("GET") } @@ -57,8 +57,8 @@ func getLogs(c *Context, w http.ResponseWriter, r *http.Request) { w.Write([]byte(model.ArrayToJson(lines))) } -func getClientProperties(c *Context, w http.ResponseWriter, r *http.Request) { - w.Write([]byte(model.MapToJson(utils.ClientProperties))) +func getClientConfig(c *Context, w http.ResponseWriter, r *http.Request) { + w.Write([]byte(model.MapToJson(utils.ClientCfg))) } func logClient(c *Context, w http.ResponseWriter, r *http.Request) { |