diff --git a/src/org/leolo/rail/Constants.java b/src/org/leolo/rail/Constants.java index 1b033b2..0f3e8b0 100644 --- a/src/org/leolo/rail/Constants.java +++ b/src/org/leolo/rail/Constants.java @@ -13,8 +13,6 @@ public class Constants { public static final long DEFAULT_SLEEP_TIME = 1000; public static final long INCRESE_RATIO = 2; public static final boolean DEBUG_MODE = true; - public static final long LTR_FORCE_RUN_THRESHOLD = 108_000_000; //1.25 days - public static final long LTR_SKIP_THRESHOLD = 21_600_000; //0.25 days } public static class Scheduler{ @@ -22,6 +20,8 @@ public class Constants { public static final String DEFAULT_GROUP_NAME = "dgroup"; public static final String LTSJ_CRON_TRIGGER = "T-LTSJ-C"; + public static final long LTR_FORCE_RUN_THRESHOLD = 108_000_000; //1.25 days + public static final long LTR_SKIP_THRESHOLD = 21_600_000; //0.25 days } diff --git a/src/org/leolo/rail/LongTermScheduleJob.java b/src/org/leolo/rail/LongTermScheduleJob.java index f88d8bb..5597468 100644 --- a/src/org/leolo/rail/LongTermScheduleJob.java +++ b/src/org/leolo/rail/LongTermScheduleJob.java @@ -45,7 +45,7 @@ public class LongTermScheduleJob implements Job{ Date nextFireTime = trigger.getNextFireTime(); log.info("Next fire at "+nextFireTime); long timeToNextFire = nextFireTime.getTime() - System.currentTimeMillis(); - if(timeToNextFire > Constants.Generic.LTR_SKIP_THRESHOLD && !ConfigurationManager.getInstance().getBoolean("general.debug", false)) { + if(timeToNextFire > Constants.Scheduler.LTR_SKIP_THRESHOLD && !ConfigurationManager.getInstance().getBoolean("general.debug", false)) { log.always().log("Too close to next fire time. Skipping"); return; } diff --git a/src/org/leolo/rail/NRDataDamon.java b/src/org/leolo/rail/NRDataDamon.java index fd34db1..ad60022 100644 --- a/src/org/leolo/rail/NRDataDamon.java +++ b/src/org/leolo/rail/NRDataDamon.java @@ -51,7 +51,7 @@ public class NRDataDamon { boolean scheduleJob = lastLTRDate == null; if(!scheduleJob) { long diff = System.currentTimeMillis() - lastLTRDate.getTime(); - if(diff > Constants.Generic.LTR_FORCE_RUN_THRESHOLD) { + if(diff > Constants.Scheduler.LTR_FORCE_RUN_THRESHOLD) { scheduleJob = true; } } @@ -80,14 +80,14 @@ public class NRDataDamon { // TODO Auto-generated catch block e.printStackTrace(); } -// NRDataDamon ndd = new NRDataDamon(); -// try { -//// ndd.init(); -//// ndd.run(); -// } catch (Exception e) { -// log.error(e.getMessage(), e); -// System.exit(-1); -// } + NRDataDamon ndd = new NRDataDamon(); + try { + ndd.init(); + ndd.run(); + } catch (Exception e) { + log.error(e.getMessage(), e); + System.exit(-1); + } } public void init() throws Exception { @@ -102,7 +102,7 @@ public class NRDataDamon { log.warn("Network Rail processing thread died. Restarting..."); nrpt = new NetowrkRailProcessingThread(); nrpt.init(); -// nrpt.start(); + nrpt.start(); } try { Thread.sleep(2500);