Improved startup logging and avoid scripts being loaded in start level service thread (#1919)

Signed-off-by: Kai Kreuzer <kai@openhab.org>
This commit is contained in:
Kai Kreuzer
2020-12-13 09:31:09 +01:00
committed by GitHub
parent 91469ddb9b
commit 1a2c81d9e2
3 changed files with 8 additions and 3 deletions
@@ -301,9 +301,12 @@ public class ScriptFileWatcher extends AbstractWatchService implements ReadyTrac
@Override
public void onReadyMarkerAdded(@NonNull ReadyMarker readyMarker) {
started = true;
importResources(new File(pathToWatch));
scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("scriptwatcher"));
scheduler.scheduleWithFixedDelay(this::checkFiles, RECHECK_INTERVAL, RECHECK_INTERVAL, TimeUnit.SECONDS);
ScheduledExecutorService localScheduler = Executors
.newSingleThreadScheduledExecutor(new NamedThreadFactory("scriptwatcher"));
scheduler = localScheduler;
localScheduler.submit(() -> importResources(new File(pathToWatch)));
localScheduler.scheduleWithFixedDelay(this::checkFiles, RECHECK_INTERVAL, RECHECK_INTERVAL, TimeUnit.SECONDS);
}
@Override
@@ -1440,6 +1440,7 @@ public class RuleEngineImpl implements RuleManager, RegistryChangeListener<Modul
Map.of(SystemTriggerHandler.OUT_STARTLEVEL, StartLevelService.STARTLEVEL_RULES)));
started = true;
readyService.markReady(MARKER);
logger.info("Rule engine started.");
});
}
@@ -251,6 +251,7 @@ public class StartLevelService {
scheduler.submit(() -> {
StartlevelEvent startlevelEvent = SystemEventFactory.createStartlevelEvent(level);
eventPublisher.post(startlevelEvent);
logger.debug("Reached start level {}", level);
});
}
}