LogDog: Update to archival V2.

server/cmd/logdog_archivist/main.go

Index: server/cmd/logdog_archivist/main.go
diff --git a/server/cmd/logdog_archivist/main.go b/server/cmd/logdog_archivist/main.go
index ecb0609cb3af8d158d3908b72d6a7fabacadf045..9577984801d140e31b535903551518d5569dccf3 100644
--- a/server/cmd/logdog_archivist/main.go
+++ b/server/cmd/logdog_archivist/main.go
@@ -110,31 +110,20 @@ func (a *application) runArchivist(c context.Context) error {
 		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
-
-		default:
-			log.Fields{
-				log.ErrorKey: err,
-				"duration":   duration,
-			}.Errorf(c, "Non-transient error processing task; deleting.")
-			return true
+			}.Errorf(c, "Task processing failed. Not deleting.")
+			return false
 		}
+
+		log.Fields{
+			"duration": duration,
+		}.Infof(c, "Task successfully processed; deleting.")
+		return true
 	})
 
 	log.Debugf(c, "Archivist finished.")