fix watchdog, fix exiting when network goes away, etc

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index 5893cb8a8a5806d211e45715c00f5c3362ed4a84..4b33231725bdafa149c7bf4e034a12e9c542f24b 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -140,6 +140,7 @@ class Erebus(object): #singleton to pass around
                def __repr__(self): return "<Channel %r>" % (self.name)
 
        def __init__(self, cfg):
+               self.mustquit = None
                self.starttime = time.time()
                self.cfg = cfg
                self.trigger = cfg.trigger
@@ -223,10 +224,12 @@ class Erebus(object): #singleton to pass around
                return chan
 
        def poll(self):
+               timeout_seconds = 30
                if self.potype == "poll":
-                       return [fd for (fd, ev) in self.po.poll()]
+                       pollres = self.po.poll(timeout_seconds * 1000)
+                       return [fd for (fd, ev) in pollres]
                elif self.potype == "select":
-                       return select.select(self.fdlist, [], [])[0]
+                       return select.select(self.fdlist, [], [], timeout_seconds)[0]
 
        def connectall(self):
                for bot in self.bots.values():
@@ -329,6 +332,8 @@ def loop():
        for fileno in poready:
                for line in main.fd(fileno).getdata():
                        main.fd(fileno).parse(line)
+       if main.mustquit is not None:
+               raise main.mustquit
 
 if __name__ == '__main__':
        try: os.rename('logfile', 'oldlogs/%s' % (time.time()))