LogDog: Update to archival V2.

server/cmd/logdog_archivist/main.go

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package main
 
 import (
         "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/errors"
@@ skipping 92 matching lines @@
         }
 
         log.Fields{
                 "project": tqOpts.Project,
                 "queue":   tqOpts.Queue,
         }.Infof(c, "Pulling tasks from task queue.")
         taskqueueClient.RunTasks(shutdownCtx, tqOpts, func(c context.Context, t taskqueueClient.Task) bool {
                 c = log.SetField(c, "taskID", t.ID)
 
                 startTime := clock.Now(c)
-                err := ar.ArchiveTask(c, t.Payload)
+                deleteTask := ar.ArchiveTask(c, t.Payload, t.Age(clock.Get(c)))
                 duration := clock.Now(c).Sub(startTime)
 
-                switch {
-                case errors.IsTransient(err):
-                        // Do not consume
-                        log.Fields{
-                                log.ErrorKey: err,
-                                "duration":   duration,
-                        }.Warningf(c, "TRANSIENT error processing task.")
-                        return false
-
-                case err == nil:
+                if !deleteTask {
                         log.Fields{
                                 "duration": duration,
-                        }.Infof(c, "Task successfully processed; deleting.")
-                        return true
+                        }.Errorf(c, "Task processing failed. Not deleting.")
+                        return false
+                }
 
-                default:
-                        log.Fields{
-                                log.ErrorKey: err,
-                                "duration":   duration,
-                        }.Errorf(c, "Non-transient error processing task; deleting.")
-                        return true
-                }
+                log.Fields{
+                        "duration": duration,
+                }.Infof(c, "Task successfully processed; deleting.")
+                return true
         })
 
         log.Debugf(c, "Archivist finished.")
         return nil
 }
 
 // Entry point.
 func main() {
         a := application{}
         a.Run(context.Background(), a.runArchivist)
 }