aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Timers.py7
-rwxr-xr-xstart.py2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Timers.py b/src/Timers.py
index 7b595847..ec2d98e5 100644
--- a/src/Timers.py
+++ b/src/Timers.py
@@ -28,7 +28,8 @@ class Timer(object):
return self._done
class Timers(object):
- def __init__(self, events, log):
+ def __init__(self, database, events, log):
+ self.database = database
self.events = events
self.log = log
self.timers = []
@@ -40,12 +41,12 @@ class Timers(object):
"next-due"], id, False, timer["kwargs"])
def _persist(self, timer):
- self.set_setting("timer-%s" % timer.id, {
+ self.database.bot_settings.set("timer-%s" % timer.id, {
"name": timer.name, "delay": timer.delay,
"next-due": timer.next_due, "kwargs": timer.kwargs})
def _remove(self, timer):
self.timers.remove(timer)
- self.del_setting("timer-%s" % timer.id)
+ self.database.bot_settings.delete("timer-%s" % timer.id)
def add(self, name, delay, next_due=None, **kwargs):
self._add(name, delay, next_due, None, False, kwargs)
diff --git a/start.py b/start.py
index 9783d4d7..55d084fc 100755
--- a/start.py
+++ b/start.py
@@ -35,7 +35,7 @@ config = Config.Config(args.config)
database = Database.Database(log, args.database)
events = events = EventManager.EventHook(log)
exports = exports = Exports.Exports()
-timers = Timers.Timers(events, log)
+timers = Timers.Timers(database, events, log)
line_handler = IRCLineHandler.LineHandler(events, timers)
modules = modules = ModuleManager.ModuleManager(events, exports, config, log,
os.path.join(directory, "modules"))