Scheduler: don't immediately execute commands when restoring repeated events.

This commit is contained in:
Daniel Folkinshteyn 2010-09-04 01:25:57 -04:00
parent 0fe7912628
commit 3c00d82579
2 changed files with 4 additions and 4 deletions

View File

@ -78,7 +78,7 @@ class Scheduler(callbacks.Plugin):
event['time'], event['command'], n)
elif event['type'] == 'repeat': # repeating event
self._repeat(ircobj, event['msg'], name,
event['time'], event['command'])
event['time'], event['command'], False)
except AssertionError, e:
if str(e) == 'An event with the same name has already been scheduled.':
# we must be reloading the plugin, event is still scheduled
@ -160,9 +160,9 @@ class Scheduler(callbacks.Plugin):
irc.error('Invalid event id.')
remove = wrap(remove, ['lowered'])
def _repeat(self, irc, msg, name, seconds, command):
def _repeat(self, irc, msg, name, seconds, command, now=True):
f = self._makeCommandFunction(irc, msg, command, remove=False)
id = schedule.addPeriodicEvent(f, seconds, name)
id = schedule.addPeriodicEvent(f, seconds, name, now)
assert id == name
self.events[name] = {'command':command,
'msg':msg,

View File

@ -1,3 +1,3 @@
"""stick the various versioning attributes in here, so we only have to change
them once."""
version = '0.83.4.1+gribble (2010-09-02T18:31:42-0400)'
version = '0.83.4.1+gribble (2010-09-04T01:25:57-0400)'