X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ac037435f2ee9688957f1c0be6bfa9066ac027ba..7ec30c76580397ca6b06bf1bbdb1ca9dc9f7af2f:/services/keepstore/trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 6b8d60bdf1..72b9a4663a 100644
--- a/services/keepstore/trash_worker.go
+++ b/services/keepstore/trash_worker.go
@@ -13,8 +13,6 @@ import (
 		Repeat
 */
 
-var DEFAULT_TRASH_LIFE_TIME int64 = 1209600 // Use 2 weeks for now
-
 func RunTrashWorker(trashq *WorkQueue) {
 	nextItem := trashq.NextItem
 	for item := range nextItem {
@@ -36,7 +34,7 @@ func TrashItem(trashRequest TrashRequest) (err error) {
 		if err == nil {
 			if trashRequest.BlockMtime == mtime.Unix() {
 				currentTime := time.Now().Unix()
-				if (currentTime - trashRequest.BlockMtime) > DEFAULT_TRASH_LIFE_TIME {
+				if time.Duration(currentTime-trashRequest.BlockMtime)*time.Second >= permission_ttl {
 					err = volume.Delete(trashRequest.Locator)
 				}
 			}