routines: Manager handles errors far better now

routines/routines.go

@@ -88,7 +88,7 @@ func (this *Manager) Run (ctx context.Context) error {
 	waitGroup.Wait()
 	
 	done()
-	return nil
+	return ctx.Err()
 }
 
 // Append adds one or more routines to the Routines slice. This has no effect if
@@ -134,7 +134,7 @@ func (this *Manager) runRoutine (routine Routine, group *sync.WaitGroup) {
 		err := panicWrap(routine.Run, this.ctx)
 		
 		if ctxErr := this.ctx.Err(); ctxErr != nil {
-			if err == nil {
+			if err == nil || errors.Is(err, context.Canceled) {
 				this.log("(i) stopped routine")
 			} else {
 				this.log("!!! stopped routine, with error:", err)
@@ -148,8 +148,8 @@ func (this *Manager) runRoutine (routine Routine, group *sync.WaitGroup) {
 		} else {
 			this.log("XXX routine failed:", err)
 		}
-		
-		if time.Since(lastStart) < this.RestartDeadline {
+
+		if time.Since(lastStart) < restartDeadline {
 			this.log("!!! not restarting routine, failed too soon")
 			break
 		} else {