From 29807d891d99bb0eeacce0677cf68d1d4d118a30 Mon Sep 17 00:00:00 2001 Message-Id: <29807d891d99bb0eeacce0677cf68d1d4d118a30.1715573004.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 15 May 2010 19:29:06 +0100 Subject: [PATCH] svc/conntrack.in: Keep the D-Bus monitor alive. Organization: Straylight/Edgeware From: Mark Wooding 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. --- svc/conntrack.in | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/svc/conntrack.in b/svc/conntrack.in index eabdc2b1..18e2f730 100644 --- 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. """ + global DBM 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(): """ -- [mdw]