From 19617c14f8e0121226a5d00d24b26dabc4dffdb9 Mon Sep 17 00:00:00 2001
From: Chris Eager <chris@signal.org>
Date: Fri, 4 Jun 2021 17:07:00 -0500
Subject: [PATCH] Improved logging in ManagedPeriodcWork

---
 .../textsecuregcm/storage/ManagedPeriodicWork.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
index 1ab878882..6fb0c6128 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
@@ -14,7 +14,7 @@ import org.whispersystems.textsecuregcm.util.Util;
 
 public abstract class ManagedPeriodicWork implements Managed, Runnable {
 
-  private static final Logger logger = LoggerFactory.getLogger(ManagedPeriodicWork.class);
+  private final Logger logger = LoggerFactory.getLogger(getClass());
 
   private final ManagedPeriodicWorkCache cache;
   private final Duration workerTtl;
@@ -58,7 +58,7 @@ public abstract class ManagedPeriodicWork implements Managed, Runnable {
         execute();
         sleepWhileRunning(runInterval);
       } catch (final Exception e) {
-        logger.warn("Error in crawl crawl", e);
+        logger.warn("Error in execution", e);
 
         // wait a bit, in case the error is caused by external instability
         Util.sleep(10_000);
@@ -78,16 +78,19 @@ public abstract class ManagedPeriodicWork implements Managed, Runnable {
       try {
         final long startTimeMs = System.currentTimeMillis();
 
+        logger.info("Starting execution");
         doPeriodicWork();
+        logger.info("Execution complete");
 
         final long endTimeMs = System.currentTimeMillis();
         final Duration sleepInterval = runInterval.minusMillis(endTimeMs - startTimeMs);
         if (sleepInterval.getSeconds() > 0) {
+          logger.info("Sleeping for {}", sleepInterval);
           sleepWhileRunning(sleepInterval);
         }
 
       } catch (final Exception e) {
-        logger.warn("Failed to process chunk", e);
+        logger.warn("Periodic work failed", e);
 
         // wait a full interval for recovery
         sleepWhileRunning(runInterval);