svc/conntrack.in: Keep the D-Bus monitor alive.

Turns out nothing actually tried to keep the monitor alive.  After a
(rather random) interval, the bus just got dropped and we didn't get
any more notifications from anyone.

Stash it in a global variable.

diff --git a/svc/conntrack.in b/svc/conntrack.in
index eabdc2b114a0de2350da5e017bdec181e4e12426..18e2f73008aa0d980f5aa2213ffec366e2a614bc 100644 (file)
--- a/svc/conntrack.in
+++ b/svc/conntrack.in
@@ -457,12 +457,13 @@ def init():
   Add the D-Bus monitor here, because we might send commands off immediately,
   and we want to make sure the server connection is up.
   """
   Add the D-Bus monitor here, because we might send commands off immediately,
   and we want to make sure the server connection is up.
   """

+  global DBM

   T.Coroutine(kickpeers, name = 'kickpeers').switch()
   T.Coroutine(kickpeers, name = 'kickpeers').switch()

-  dbm = DBusMonitor()
-  dbm.addmon(NetworkManagerMonitor())
-  dbm.addmon(MaemoICdMonitor())
-  G.timeout_add_seconds(300, lambda: (netupdown(True, ['interval-timer'])
-                                      or True))
+  DBM = DBusMonitor()
+  DBM.addmon(NetworkManagerMonitor())
+  DBM.addmon(MaemoICdMonitor())
+  G.timeout_add_seconds(30, lambda: (netupdown(True, ['interval-timer'])
+                                     or True))

 
 def parse_options():
   """
 
 def parse_options():
   """