3761: log errors in RunPullWorker instead of Pull method.

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index e102f5a237830a58b488a9e09b65d5a361ccd133..46b933c5e0503824a2d02b4a60d1390cd5515eaa 100644 (file)
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -22,7 +22,13 @@ import (
 func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
        nextItem := pullq.NextItem
        for item := range nextItem {
-               Pull(item.(PullRequest), keepClient)
+               pullRequest := item.(PullRequest)
+               err := Pull(item.(PullRequest), keepClient)
+               if err == nil {
+                       log.Printf("Pull %s success", pullRequest)
+               } else {
+                       log.Printf("Pull %s error: %s", pullRequest, err)
+               }
        }
 }
 
@@ -34,14 +40,6 @@ func RunPullWorker(pullq *WorkQueue, keepClient keepclient.KeepClient) {
                Write to storage
 */
 func Pull(pullRequest PullRequest, keepClient keepclient.KeepClient) (err error) {
-       defer func() {
-               if err == nil {
-                       log.Printf("Pull %s success", pullRequest)
-               } else {
-                       log.Printf("Pull %s error: %s", pullRequest, err)
-               }
-       }()
-
        service_roots := make(map[string]string)
        for _, addr := range pullRequest.Servers {
                service_roots[addr] = addr

diff --git a/services/keepstore/pull_worker_test.go b/services/keepstore/pull_worker_test.go
index 2ccb94d2ae537ca7bdd174f2aacfc13a35b71781..43f01f769fe2d48f4194db4745edcec7700c1d9f 100644 (file)
--- a/services/keepstore/pull_worker_test.go
+++ b/services/keepstore/pull_worker_test.go
@@ -19,7 +19,7 @@ var processedPullLists map[string]string
 type PullWorkerTestSuite struct{}
 
 // Gocheck boilerplate
-func Test(t *testing.T) {
+func TestPullWorker(t *testing.T) {
        TestingT(t)
 }