christian/openhab-automation-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: christian:e299b96d1588c6c7550dced1c845524e86c3821b
Branches Tags
christian:main
..
compare: christian:47d6b805114aab7e8b43ce2378b347a143301f47
Branches Tags
christian:main

2 Commits
e299b96d15 ... 47d6b80511

Author SHA1 Message Date
Christian Weimann
47d6b80511 refactor(TimerMgr): streamline timer identification and logging 2025-01-10 06:08:04 +01:00
Christian Weimann
33e5781ee8 fix(TimerMgr): add warning for rescheduling non-existent timers 2025-01-10 06:05:20 +01:00
1 changed files with 13 additions and 9 deletions
Expand all files Collapse all files

22
utils/TimerMgr.js
View File

@@ -18,23 +18,23 @@ class TimerMgr {
this.#timers[id] = actions.ScriptExecution.createTimer(id, timeout, func); this.#timers[id] = actions.ScriptExecution.createTimer(id, timeout, func);
} }
cancel(identifier) { cancel(id) {
// Return if no timer with the respactive identifier is available // Return if no timer with the respactive id is available
if (!this.#timers.hasOwnProperty(identifier)) { if (!this.hasTimer(id)) {
log.debug(`No timer with identifier ${identifier} available to cancel`); log.warn(`No timer with id ${id} available to cancel`);
return false; return false;
} }
// Check if timer is active // Check if timer is active
if (!this.#timers[identifier].isActive()) { if (!this.#timers[id].isActive()) {
log.debug(`Timer with identifier ${identifier} not running. Cancel anyway`); log.debug(`Timer with id ${id} not running. Cancel anyway`);
} else { } else {
log.debug(`Cancel timer with identifier ${identifier}`); log.debug(`Cancel timer with identifier ${id}`);
} }
// Cancel timer // Cancel timer
this.#timers[identifier].cancel(); this.#timers[id].cancel();
delete this.#timers[identifier]; delete this.#timers[id];
} }
hasTimer(id) { hasTimer(id) {
@@ -66,6 +66,10 @@ class TimerMgr {
} }
reschedule(id, timeout) { reschedule(id, timeout) {
if (!this.hasTimer(id)) {
log.warn(`Cannot reschedule non-existent timer with id ${id}`);
return false;
}
this.#timers[id].reschedule(timeout); this.#timers[id].reschedule(timeout);
} }
} }