5493: add test for the getting_started help menu item.

[arvados.git] / services / keepstore / trash_worker.go

diff --git a/services/keepstore/trash_worker.go b/services/keepstore/trash_worker.go
index 6b8d60bdf1f77e2bdf0e5e5aaca8b2e8f75f9164..72b9a4663adb0099a7068cfd2e0f0f9ac4228f77 100644 (file)
--- 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)
                                }
                        }