diff options
| author |  jesopo | 2018-10-12 18:07:23 +0100 |
|---|---|---|
| committer | jesopo | 2018-10-12 18:07:23 +0100 |
| commit | 819f4e0680dc8225355924e87bc71938605b98f7 (patch) | |
| tree | 435f17eccda20a1723f51330ee0403668c76afcd /src | |
| parent | Add TimersContext, to be able to purge timers when modules are unloaded (diff) | |
| signature | ||
Pass context-wrapped timers to each module, add ModuleManager.BaseModule.on_load
Diffstat (limited to 'src')
| -rw-r--r-- | src/IRCBot.py | 8 | ||||
| -rw-r--r-- | src/ModuleManager.py | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/IRCBot.py b/src/IRCBot.py index d3e98b23..472c7054 100644 --- a/src/IRCBot.py +++ b/src/IRCBot.py @@ -14,7 +14,7 @@ class Bot(object): self._exports = exports self.log = log self.modules = modules - self.timers = timers + self._timers = timers self.start_time = time.time() self.lock = threading.Lock() @@ -100,7 +100,7 @@ class Bot(object): def get_poll_timeout(self): timeouts = [] - timeouts.append(self.timers.next()) + timeouts.append(self._timers.next()) timeouts.append(self.next_send()) timeouts.append(self.next_ping()) timeouts.append(self.next_read_timeout()) @@ -146,7 +146,7 @@ class Bot(object): while self.running: events = self.poll.poll(self.get_poll_timeout()) self.lock.acquire() - self.timers.call() + self._timers.call() self.cache.expire() for func in self._trigger_functions: @@ -192,7 +192,7 @@ class Bot(object): self.disconnect(server) reconnect_delay = self.config.get("reconnect-delay", 10) - self.timers.add("reconnect", reconnect_delay, + self._timers.add("reconnect", reconnect_delay, server_id=server.id) print("disconnected from %s, reconnecting in %d seconds" % ( diff --git a/src/ModuleManager.py b/src/ModuleManager.py index 6b097815..8f182c8d 100644 --- a/src/ModuleManager.py +++ b/src/ModuleManager.py @@ -27,6 +27,9 @@ class BaseModule(object): self.events = events self.exports = exports self.timers = timers + self.on_load() + def on_load(self): + pass class ModuleManager(object): def __init__(self, events, exports, timers, config, log, directory): |