3605: Automatically reload the dashboard using ajax.

[arvados.git] / services / keepstore / handlers.go

diff --git a/services/keepstore/handlers.go b/services/keepstore/handlers.go
index 9d4c617d88ee351e42e210a0e784f5c7e140e7ac..84fa6a6a88cf5a10b16a2280d6948dfda972e2f5 100644 (file)
--- a/services/keepstore/handlers.go
+++ b/services/keepstore/handlers.go
@@ -13,7 +13,7 @@ import (
        "crypto/md5"
        "encoding/json"
        "fmt"
-       "git.curoverse.com/arvados.git/services/keepstore/replicator"
+       "git.curoverse.com/arvados.git/services/keepstore/pull_list"
        "github.com/gorilla/mux"
        "io"
        "log"
@@ -61,7 +61,7 @@ func MakeRESTRouter() *mux.Router {
 
        // The PullHandler processes "PUT /pull" commands from Data Manager.
        // It parses the JSON list of pull requests in the request body, and
-       // delivers them to the PullBlocks goroutine for replication.
+       // delivers them to the pull list manager for replication.
        rest.HandleFunc(`/pull`, PullHandler).Methods("PUT")
 
        // Any request which does not match any of these routes gets
@@ -441,28 +441,31 @@ func PullHandler(resp http.ResponseWriter, req *http.Request) {
        api_token := GetApiToken(req)
        if !IsDataManagerToken(api_token) {
                http.Error(resp, UnauthorizedError.Error(), UnauthorizedError.HTTPCode)
+               log.Printf("%s %s: %s\n", req.Method, req.URL, UnauthorizedError.Error())
                return
        }
 
        // Parse the request body.
-       var pull_list []replicator.PullRequest
+       var plist []pull_list.PullRequest
        r := json.NewDecoder(req.Body)
-       if err := r.Decode(&pull_list); err != nil {
+       if err := r.Decode(&plist); err != nil {
                http.Error(resp, BadRequestError.Error(), BadRequestError.HTTPCode)
+               log.Printf("%s %s: %s\n", req.Method, req.URL, err.Error())
                return
        }
 
        // We have a properly formatted pull list sent from the data
-       // manager.  Report success and send the list to the keep
-       // replicator for further handling.
+       // manager.  Report success and send the list to the pull list
+       // manager for further handling.
+       log.Printf("%s %s: received %v\n", req.Method, req.URL, plist)
        resp.WriteHeader(http.StatusOK)
        resp.Write([]byte(
-               fmt.Sprintf("Received %d pull requests\n", len(pull_list))))
+               fmt.Sprintf("Received %d pull requests\n", len(plist))))
 
-       if replica == nil {
-               replica = replicator.New()
+       if pullmgr == nil {
+               pullmgr = pull_list.NewManager()
        }
-       replica.Pull(pull_list)
+       pullmgr.SetList(plist)
 }
 
 // ==============================