From cd7faaba3814a87d40246332b0f065d23d685d33 Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Thu, 2 Jun 2016 08:30:49 -0700
Subject: [PATCH] convert serverID

---
 socketserver/server/backend.go | 14 ++++++++++----
 socketserver/server/utils.go   |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go
index ae085093..deac6327 100644
--- a/socketserver/server/backend.go
+++ b/socketserver/server/backend.go
@@ -23,7 +23,7 @@ const bPathAddTopic = "/topics"
 const bPathAggStats = "/stats"
 const bPathOtherCommand = "/cmd/"
 
-type backend struct {
+type backendInfo struct {
 	HTTPClient http.Client
 	baseURL string
 	responseCache *cache.Cache
@@ -37,6 +37,9 @@ type backend struct {
 
 	lastSuccess map[string]time.Time
 }
+
+var Backend *backendInfo
+
 var backendHTTPClient http.Client
 var backendURL string
 var responseCache *cache.Cache
@@ -46,12 +49,13 @@ var addTopicURL string
 var announceStartupURL string
 
 var backendSharedKey [32]byte
-var serverID int
 
 var lastBackendSuccess map[string]time.Time
 
-func setupBackend(config *ConfigFile) {
-	serverID = config.ServerID
+func setupBackend(config *ConfigFile) *backendInfo {
+	b := new(backendInfo)
+	Backend = b
+	b.serverID = config.ServerID
 
 	backendHTTPClient.Timeout = 60 * time.Second
 	backendURL = config.BackendURL
@@ -77,6 +81,8 @@ func setupBackend(config *ConfigFile) {
 	copy(ourPrivate[:], config.OurPrivateKey)
 
 	box.Precompute(&backendSharedKey, &theirPublic, &ourPrivate)
+
+	return b
 }
 
 func getCacheKey(remoteCommand, data string) string {
diff --git a/socketserver/server/utils.go b/socketserver/server/utils.go
index 1c895e6b..b2618cd2 100644
--- a/socketserver/server/utils.go
+++ b/socketserver/server/utils.go
@@ -58,7 +58,7 @@ func SealRequest(form url.Values) (url.Values, error) {
 	retval := url.Values{
 		"nonce": []string{nonceString},
 		"msg":   []string{cipherString},
-		"id":    []string{strconv.Itoa(serverID)},
+		"id":    []string{strconv.Itoa(Backend.serverID)},
 	}
 
 	return retval, nil