6260: Rename ReportDone to DoneItem.

diff --git a/services/keepstore/pull_worker.go b/services/keepstore/pull_worker.go
index d55fd3218535735ded387d43a752ec8c4a56215b..acf861119f47fd1b765bcad461d826c369151968 100644 (file)
--- a/services/keepstore/pull_worker.go
+++ b/services/keepstore/pull_worker.go
@@ -24,7 +24,7 @@ func RunPullWorker(pullq *WorkQueue, keepClient *keepclient.KeepClient) {
        for item := range nextItem {
                pullRequest := item.(PullRequest)
                err := PullItemAndProcess(item.(PullRequest), GenerateRandomApiToken(), keepClient)
-               pullq.ReportDone <- struct{}{}
+               pullq.DoneItem <- struct{}{}
                if err == nil {
                        log.Printf("Pull %s success", pullRequest)
                } else {

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 2cf2dc8d327614e3f0b5b1e61b763aad4f34fc30..8f78658c3a7496473c2d81a7f0d7b13213ef9d5f 100644 (file)
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -18,7 +18,7 @@ func RunTrashWorker(trashq *WorkQueue) {
        for item := range trashq.NextItem {
                trashRequest := item.(TrashRequest)
                TrashItem(trashRequest)
-               trashq.ReportDone <- struct{}{}
+               trashq.DoneItem <- struct{}{}
        }
 }
 

diff --git a/services/keepstore/work_queue.go b/services/keepstore/work_queue.go
index 58e49665950dd929b54668ec4ce7bf5c87174d57..f1878ffbbc550250ab88c5ea9a4a694d12d63132 100644 (file)
--- a/services/keepstore/work_queue.go
+++ b/services/keepstore/work_queue.go
@@ -89,11 +89,11 @@ type WorkQueue struct {
        newlist   chan *list.List
        // Workers get work items by reading from this channel.
        NextItem <-chan interface{}
-       // Each worker must send struct{}{} to ReportDone exactly once
+       // Each worker must send struct{}{} to DoneItem exactly once
        // for each work item received from NextItem, when it stops
        // working on that item (regardless of whether the work was
        // successful).
-       ReportDone chan<- struct{}
+       DoneItem chan<- struct{}
 }
 
 type WorkQueueStatus struct {
@@ -108,10 +108,10 @@ func NewWorkQueue() *WorkQueue {
        reportDone := make(chan struct{})
        newList := make(chan *list.List)
        b := WorkQueue{
-               getStatus:  make(chan WorkQueueStatus),
-               newlist:    newList,
-               NextItem:   nextItem,
-               ReportDone: reportDone,
+               getStatus: make(chan WorkQueueStatus),
+               newlist:   newList,
+               NextItem:  nextItem,
+               DoneItem:  reportDone,
        }
        go func() {
                // Read new work lists from the newlist channel.

diff --git a/services/keepstore/work_queue_test.go b/services/keepstore/work_queue_test.go
index 7844a2b87cde29546239f505dc5cf949781f87ab..74c67f2dd0a6c1ee69748d24c162d95b5c98b16a 100644 (file)
--- a/services/keepstore/work_queue_test.go
+++ b/services/keepstore/work_queue_test.go
@@ -59,7 +59,7 @@ func doWorkItems(t fatalfer, q *WorkQueue, expected []int) {
                if !ok {
                        t.Fatalf("Expected %+v but channel was closed after receiving %+v as expected.", expected, expected[:i])
                }
-               q.ReportDone <- struct{}{}
+               q.DoneItem <- struct{}{}
                if actual.(int) != expected[i] {
                        t.Fatalf("Expected %+v but received %+v after receiving %+v as expected.", expected[i], actual, expected[:i])
                }
@@ -101,7 +101,7 @@ func TestWorkQueueDoneness(t *testing.T) {
                for _ = range b.NextItem {
                        <-gate
                        time.Sleep(time.Millisecond)
-                       b.ReportDone <- struct{}{}
+                       b.DoneItem <- struct{}{}
                }
        }()
        expectEqualWithin(t, time.Second, 0, func() interface{} { return b.Status().InProgress })
@@ -167,7 +167,7 @@ func TestWorkQueueClose(t *testing.T) {
                <-b.NextItem
                mark <- struct{}{}
                <-mark
-               b.ReportDone <- struct{}{}
+               b.DoneItem <- struct{}{}
        }()
        b.ReplaceQueue(makeTestWorkList(input))
        // Wait for worker to take item 1