Fixed the problem of having multiple upkeeps scheduled.

src/Owner.py

@@ -379,7 +379,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
 
         Runs the standard upkeep stuff (flushes and gc.collects()).
         """
-        collected = world.upkeep()
+        collected = world.upkeep(scheduleNext=False)
         if gc.garbage:
             irc.reply('Garbage!  %r' % gc.garbage)
         else:

src/world.py

@@ -77,7 +77,7 @@ def flush():
         except Exception, e:
             log.exception('Uncaught exception in flusher:')
 
-def upkeep():
+def upkeep(scheduleNext=True):
     """Does upkeep (like flushing, garbage collection, etc.)"""
     sys.exc_clear() # Just in case, let's clear the exception info.
     collected = gc.collect()
@@ -107,6 +107,7 @@ def upkeep():
             log.info('%s Flushers flushed and garbage collected.', timestamp)
         else:
             log.info('%s Garbage collected.', timestamp)
+    if scheduleNext:
         schedule.addEvent(upkeep, time.time() + conf.supybot.upkeepInterval())
     return collected