From eb4e6e877246dafcc20f947248f684a74747892d Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Thu, 17 Jul 2014 02:18:54 +0700 Subject: [PATCH] Fix syntax consistency --- server.go | 8 ++++---- state.go | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/server.go b/server.go index 38d7180..c5f62a1 100644 --- a/server.go +++ b/server.go @@ -24,16 +24,16 @@ func StatusHandler(w http.ResponseWriter, r *http.Request) { } } - infoJson, _ := json.Marshal(info) - w.Write(infoJson) + jsn, _ := json.Marshal(info) + w.Write(jsn) } func DebugHandler(w http.ResponseWriter, r *http.Request) { info := make(map[string]int) info["goroutines"] = runtime.NumGoroutine() - infoJson, _ := json.Marshal(info) - w.Write(infoJson) + jsn, _ := json.Marshal(info) + w.Write(jsn) } func PublishHandler(w http.ResponseWriter, r *http.Request) { diff --git a/state.go b/state.go index bd0fb76..d278591 100644 --- a/state.go +++ b/state.go @@ -24,9 +24,9 @@ func SaveState() { } } - stateJson, _ := json.Marshal(state) + jsn, _ := json.Marshal(state) key := Key(StateMetaKey) - if err := storage.Set(key, stateJson); err != nil { + if err := storage.Set(key, jsn); err != nil { Error(err, "Failed to persist state") return } @@ -36,13 +36,14 @@ func LoadState() { state := make(ServerState) key := Key(StateMetaKey) - stateJson, err := storage.Get(key) + jsn, err := storage.Get(key) if err != nil { Log("State not found") return } - if err := json.Unmarshal(stateJson, &state); err != nil { + err = json.Unmarshal(jsn, &state) + if err != nil { Log("Failed to load state") return }