Browse Source

Regroup constants

develop
LO Kam Tao Leo 4 years ago
parent
commit
c0a192815e
  1. 4
      src/org/leolo/rail/Constants.java
  2. 2
      src/org/leolo/rail/LongTermScheduleJob.java
  3. 20
      src/org/leolo/rail/NRDataDamon.java

4
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 DEFAULT_SLEEP_TIME = 1000;
public static final long INCRESE_RATIO = 2; public static final long INCRESE_RATIO = 2;
public static final boolean DEBUG_MODE = true; 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{ public static class Scheduler{
@ -22,6 +20,8 @@ public class Constants {
public static final String DEFAULT_GROUP_NAME = "dgroup"; public static final String DEFAULT_GROUP_NAME = "dgroup";
public static final String LTSJ_CRON_TRIGGER = "T-LTSJ-C"; 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
} }

2
src/org/leolo/rail/LongTermScheduleJob.java

@ -45,7 +45,7 @@ public class LongTermScheduleJob implements Job{
Date nextFireTime = trigger.getNextFireTime(); Date nextFireTime = trigger.getNextFireTime();
log.info("Next fire at "+nextFireTime); log.info("Next fire at "+nextFireTime);
long timeToNextFire = nextFireTime.getTime() - System.currentTimeMillis(); 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"); log.always().log("Too close to next fire time. Skipping");
return; return;
} }

20
src/org/leolo/rail/NRDataDamon.java

@ -51,7 +51,7 @@ public class NRDataDamon {
boolean scheduleJob = lastLTRDate == null; boolean scheduleJob = lastLTRDate == null;
if(!scheduleJob) { if(!scheduleJob) {
long diff = System.currentTimeMillis() - lastLTRDate.getTime(); long diff = System.currentTimeMillis() - lastLTRDate.getTime();
if(diff > Constants.Generic.LTR_FORCE_RUN_THRESHOLD) { if(diff > Constants.Scheduler.LTR_FORCE_RUN_THRESHOLD) {
scheduleJob = true; scheduleJob = true;
} }
} }
@ -80,14 +80,14 @@ public class NRDataDamon {
// TODO Auto-generated catch block // TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
// NRDataDamon ndd = new NRDataDamon(); NRDataDamon ndd = new NRDataDamon();
// try { try {
//// ndd.init(); ndd.init();
//// ndd.run(); ndd.run();
// } catch (Exception e) { } catch (Exception e) {
// log.error(e.getMessage(), e); log.error(e.getMessage(), e);
// System.exit(-1); System.exit(-1);
// } }
} }
public void init() throws Exception { public void init() throws Exception {
@ -102,7 +102,7 @@ public class NRDataDamon {
log.warn("Network Rail processing thread died. Restarting..."); log.warn("Network Rail processing thread died. Restarting...");
nrpt = new NetowrkRailProcessingThread(); nrpt = new NetowrkRailProcessingThread();
nrpt.init(); nrpt.init();
// nrpt.start(); nrpt.start();
} }
try { try {
Thread.sleep(2500); Thread.sleep(2500);

Loading…
Cancel
Save