mirror of
https://github.com/danieldemus/openhab-core.git
synced 2026-07-29 12:34:22 +02:00
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:
+6
-3
@@ -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
|
||||
|
||||
+1
@@ -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);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user