MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improved logging in ManagedPeriodcWork

This commit is contained in:
Chris Eager 2021-06-04 17:07:00 -05:00 committed by Chris Eager
parent fc7291c3e8
commit 19617c14f8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/org/whispersystems/textsecuregcm/storage/ManagedPeriodicWork.java
View File

@ -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);