Merge pull request #660 from aledbf/update-client-go

Rollback queue refactoring

core/pkg/task/queue.go

@@ -82,17 +82,16 @@ func (t *Queue) worker() {
 			close(t.workerDone)
 			return
 		}
-		defer t.queue.Done(key)
 
 		glog.V(3).Infof("syncing %v", key)
-		err := t.sync(key)
+		if err := t.sync(key); err != nil {
-		if err == nil {
-			t.queue.Forget(key)
-			return
-		}
-
 			glog.Warningf("requeuing %v, err %v", key, err)
 			t.queue.AddRateLimited(key)
+		} else {
+			t.queue.Forget(key)
+		}
+
+		t.queue.Done(key)
 	}
 }