From 088290c54431c364f6fec0d3742ff4eeec6a267b Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 7 Oct 2014 12:04:55 +0000
Subject: [PATCH] Startup: Delay ReadConfigJob another minute - code cleanup
---
router/java/src/net/i2p/router/startup/BootCommSystemJob.java | 4 ++--
router/java/src/net/i2p/router/tasks/ReadConfigJob.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
index 305869bada..2b3be55868 100644
--- a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
+++ b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java
@@ -17,7 +17,7 @@ import net.i2p.util.Log;
/** This actually boots almost everything */
class BootCommSystemJob extends JobImpl {
- private Log _log;
+ private final Log _log;
public static final String PROP_USE_TRUSTED_LINKS = "router.trustedLinks";
@@ -47,7 +47,7 @@ class BootCommSystemJob extends JobImpl {
getContext().jobQueue().addJob(new StartAcceptingClientsJob(getContext()));
Job j = new ReadConfigJob(getContext());
- j.getTiming().setStartAfter(getContext().clock().now() + 60*1000);
+ j.getTiming().setStartAfter(getContext().clock().now() + 2*60*1000);
getContext().jobQueue().addJob(j);
((RouterClock) getContext().clock()).addShiftListener(getContext().router());
}
diff --git a/router/java/src/net/i2p/router/tasks/ReadConfigJob.java b/router/java/src/net/i2p/router/tasks/ReadConfigJob.java
index b11ce861f7..42391702a2 100644
--- a/router/java/src/net/i2p/router/tasks/ReadConfigJob.java
+++ b/router/java/src/net/i2p/router/tasks/ReadConfigJob.java
@@ -46,8 +46,7 @@ public class ReadConfigJob extends JobImpl {
if (log.shouldLog(Log.WARN))
log.warn("Reloaded " + configFile);
}
- getTiming().setStartAfter(getContext().clock().now() + DELAY);
- getContext().jobQueue().addJob(this);
+ requeue(DELAY);
}
private boolean shouldReread(File configFile) {
--
GitLab