X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a9b15a2f041744c8fac8c0b12fa8b61d1a7292f8..8a2c490a3905dc85a438ea92aa5b020a87d7b8b0:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index a6f09c1477..8a9fedfb70 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -5,7 +9,6 @@ import (
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	log "github.com/Sirupsen/logrus"
 )
 
 // RunTrashWorker is used by Keepstore to initiate trash worker channel goroutine.
@@ -48,24 +51,24 @@ func TrashItem(trashRequest TrashRequest) {
 	for _, volume := range volumes {
 		mtime, err := volume.Mtime(trashRequest.Locator)
 		if err != nil {
-			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+			log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err)
 			continue
 		}
 		if trashRequest.BlockMtime != mtime.UnixNano() {
-			log.Printf("%v Delete(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime)
+			log.Printf("%v Trash(%v): stored mtime %v does not match trash list value %v", volume, trashRequest.Locator, mtime.UnixNano(), trashRequest.BlockMtime)
 			continue
 		}
 
 		if !theConfig.EnableDelete {
-			err = errors.New("did not delete block because EnableDelete is false")
+			err = errors.New("skipping because EnableDelete is false")
 		} else {
 			err = volume.Trash(trashRequest.Locator)
 		}
 
 		if err != nil {
-			log.Printf("%v Delete(%v): %v", volume, trashRequest.Locator, err)
+			log.Printf("%v Trash(%v): %v", volume, trashRequest.Locator, err)
 		} else {
-			log.Printf("%v Delete(%v) OK", volume, trashRequest.Locator)
+			log.Printf("%v Trash(%v) OK", volume, trashRequest.Locator)
 		}
 	}
 }