4194: use go fmt to replace spaces with tabs.

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index d1be04a420174998358733a2d5c5335166587875..a954d2b0385d82dfe3e33303898cb297630e25a7 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -276,10 +276,10 @@ func TestIndexHandler(t *testing.T) {
        // -------------------------------------------------------------
        // Only the superuser should be allowed to issue /index requests.
 
-  // ---------------------------
-  // enforce_permissions enabled
+       // ---------------------------
+       // enforce_permissions enabled
        // This setting should not affect tests passing.
-  enforce_permissions = true
+       enforce_permissions = true
 
        // unauthenticated /index request
        // => UnauthorizedError
@@ -334,8 +334,6 @@ func TestIndexHandler(t *testing.T) {
                http.StatusOK,
                response)
 
-
-
        expected := `^` + TEST_HASH + `\+\d+ \d+\n` +
                TEST_HASH_2 + `\+\d+ \d+\n$`
        match, _ := regexp.MatchString(expected, response.Body.String())
@@ -731,8 +729,8 @@ func IssueRequest(rt *RequestTester) *httptest.ResponseRecorder {
        if rt.api_token != "" {
                req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
        }
-  loggingRouter := MakeLoggingRESTRouter()
-  loggingRouter.ServeHTTP(response, req)
+       loggingRouter := MakeLoggingRESTRouter()
+       loggingRouter.ServeHTTP(response, req)
        return response
 }
 

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 3c6d634498cdb5497ba686fc4a8c640f0016431b..75b6c4014dc3e4afdabc3efebc22c7ec8862f517 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -263,10 +263,10 @@ func main() {
        KeepVM = MakeRRVolumeManager(goodvols)
 
        // Tell the built-in HTTP server to direct all requests to the REST router.
-  loggingRouter := MakeLoggingRESTRouter()
-  http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
-    loggingRouter.ServeHTTP(resp, req)
-  })
+       loggingRouter := MakeLoggingRESTRouter()
+       http.HandleFunc("/", func(resp http.ResponseWriter, req *http.Request) {
+               loggingRouter.ServeHTTP(resp, req)
+       })
 
        // Set up a TCP listener.
        listener, err := net.Listen("tcp", listen)

diff --git a/services/keepstore/logging_router.go b/services/keepstore/logging_router.go
index 251da3ad097b0815eed12f3a4c31f8d9087f7b95..6927019fd917ad69b90f8367ce81a2dce96e8251 100644 (file)
--- a/services/keepstore/logging_router.go
+++ b/services/keepstore/logging_router.go
@@ -10,36 +10,36 @@ import (
 )
 
 type LoggingResponseWriter struct {
-  Status int
-  Length int
-  http.ResponseWriter
+       Status int
+       Length int
+       http.ResponseWriter
 }
 
 func (loggingWriter *LoggingResponseWriter) WriteHeader(code int) {
-  loggingWriter.Status = code
-  loggingWriter.ResponseWriter.WriteHeader(code)
+       loggingWriter.Status = code
+       loggingWriter.ResponseWriter.WriteHeader(code)
 }
 
-func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error){
-  loggingWriter.Length = len(data)
-  return loggingWriter.ResponseWriter.Write(data)
+func (loggingWriter *LoggingResponseWriter) Write(data []byte) (int, error) {
+       loggingWriter.Length = len(data)
+       return loggingWriter.ResponseWriter.Write(data)
 }
 
 type LoggingRESTRouter struct {
-  router *mux.Router
+       router *mux.Router
 }
 
-func MakeLoggingRESTRouter() (*LoggingRESTRouter) {
-  router := MakeRESTRouter()
-  return (&LoggingRESTRouter{router})
+func MakeLoggingRESTRouter() *LoggingRESTRouter {
+       router := MakeRESTRouter()
+       return (&LoggingRESTRouter{router})
 }
 
 func (loggingRouter *LoggingRESTRouter) ServeHTTP(resp http.ResponseWriter, req *http.Request) {
-  loggingWriter := LoggingResponseWriter{200, 0, resp}
-  loggingRouter.router.ServeHTTP(&loggingWriter, req)
-  if loggingWriter.Status == 200 {
-    log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
-  } else {
-    log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status)
-  }
+       loggingWriter := LoggingResponseWriter{200, 0, resp}
+       loggingRouter.router.ServeHTTP(&loggingWriter, req)
+       if loggingWriter.Status == 200 {
+               log.Printf("[%s] %s %s %d %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status, loggingWriter.Length)
+       } else {
+               log.Printf("[%s] %s %s %d", req.RemoteAddr, req.Method, req.URL.Path[1:], loggingWriter.Status)
+       }
 }