diff --git a/socketserver/server/backend.go b/socketserver/server/backend.go index 409f1f06..f92e4690 100644 --- a/socketserver/server/backend.go +++ b/socketserver/server/backend.go @@ -29,7 +29,7 @@ type backendInfo struct { baseURL string responseCache *cache.Cache - postStatsURL string + postStatisticsURL string addTopicURL string announceStartupURL string @@ -42,10 +42,6 @@ type backendInfo struct { var Backend *backendInfo -var postStatisticsURL string -var addTopicURL string -var announceStartupURL string - var backendSharedKey [32]byte var lastBackendSuccess map[string]time.Time @@ -59,10 +55,9 @@ func setupBackend(config *ConfigFile) *backendInfo { b.baseURL = config.BackendURL b.responseCache = cache.New(60*time.Second, 120*time.Second) - announceStartupURL = fmt.Sprintf("%s%s", b.baseURL, bPathAnnounceStartup) - addTopicURL = fmt.Sprintf("%s%s", b.baseURL, bPathAddTopic) - postStatisticsURL = fmt.Sprintf("%s%s", b.baseURL, bPathAggStats) - + b.announceStartupURL = fmt.Sprintf("%s%s", b.baseURL, bPathAnnounceStartup) + b.addTopicURL = fmt.Sprintf("%s%s", b.baseURL, bPathAddTopic) + b.postStatisticsURL = fmt.Sprintf("%s%s", b.baseURL, bPathAggStats) epochTime := time.Unix(0, 0).UTC() lastBackendSuccess = map[string]time.Time{ @@ -238,7 +233,7 @@ func (backend *backendInfo) SendAggregatedData(form url.Values) error { return err } - resp, err := backend.HTTPClient.PostForm(postStatisticsURL, sealedForm) + resp, err := backend.HTTPClient.PostForm(backend.postStatisticsURL, sealedForm) if err != nil { return err } @@ -295,7 +290,7 @@ func (backend *backendInfo) sendTopicNotice(topic string, added bool) error { return err } - resp, err := backend.HTTPClient.PostForm(addTopicURL, sealedForm) + resp, err := backend.HTTPClient.PostForm(backend.addTopicURL, sealedForm) if err != nil { return err } diff --git a/socketserver/server/handlecore.go b/socketserver/server/handlecore.go index 66547586..1ed4fde4 100644 --- a/socketserver/server/handlecore.go +++ b/socketserver/server/handlecore.go @@ -109,7 +109,7 @@ func SetupServerAndHandle(config *ConfigFile, serveMux *http.ServeMux) { if err != nil { log.Fatalln("Unable to seal requests:", err) } - resp, err := Backend.HTTPClient.PostForm(announceStartupURL, announceForm) + resp, err := Backend.HTTPClient.PostForm(Backend.announceStartupURL, announceForm) if err != nil { log.Println("could not announce startup to backend:", err) } else {