Merge pull request #174 from rqlite/cyclo_fixes

Refactor adding build version to HTTP response

http/service.go

@@ -200,12 +200,7 @@ func (s *Service) Close() {
 
 // ServeHTTP allows Service to serve HTTP requests.
 func (s *Service) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	// Add version header to every response, if available.
+	s.addBuildVersion(w)
-	if v, ok := s.BuildInfo["version"].(string); ok {
-		w.Header().Add("X-RQLITE-VERSION", v)
-	} else {
-		w.Header().Add("X-RQLITE-VERSION", "unknown")
-	}
 
 	if s.credentialStore != nil {
 		username, password, ok := r.BasicAuth()
@@ -597,6 +592,16 @@ func (s *Service) CheckRequestPerm(r *http.Request, perm string) bool {
 	return s.credentialStore.HasPerm(username, PermAll) || s.credentialStore.HasPerm(username, perm)
 }
 
+// addBuildVersion adds the build version to the HTTP response.
+func (s *Service) addBuildVersion(w http.ResponseWriter) {
+	// Add version header to every response, if available.
+	version := "unknown"
+	if v, ok := s.BuildInfo["version"].(string); ok {
+		version = v
+	}
+	w.Header().Add("X-RQLITE-VERSION", version)
+}
+
 // queriesValid returns whether the slice of queries is valid.
 func queriesValid(queries []string) bool {
 	for _, q := range queries {