From 26fb68355b4ad95f99b2d14110e683109d0bab3d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Fri, 26 Oct 2012 19:38:27 -0400
Subject: NetWatcher: When dbus connection is lost, try to reconnect.

MountWatcher can't do this, because it uses the session dbus,
and won't have access to the new DBUS_SESSION_BUS_ADDRESS if a new session
is started.

Bumped dbus library version, FD leak in it is fixed.
---
 Assistant/Threads/MountWatcher.hs |  5 +++++
 Assistant/Threads/NetWatcher.hs   | 17 +++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'Assistant')

diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs
index 294f9a972..a5200adfe 100644
--- a/Assistant/Threads/MountWatcher.hs
+++ b/Assistant/Threads/MountWatcher.hs
@@ -72,6 +72,11 @@ dbusThread st dstatus scanremotes = E.catch (runClient getSessionAddress go) one
 			)
 		onerr :: E.SomeException -> IO ()
 		onerr e = do
+			{- If the session dbus fails, the user probably
+			 - logged out of their desktop. Even if they log
+			 - back in, we won't have access to the dbus
+			 - session key, so polling is the best that can be
+			 - done in this situation. -}
 			runThreadState st $
 				warning $ "dbus failed; falling back to mtab polling (" ++ show e ++ ")"
 			pollinstead
diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs
index f9ca5641d..96b8007cc 100644
--- a/Assistant/Threads/NetWatcher.hs
+++ b/Assistant/Threads/NetWatcher.hs
@@ -24,7 +24,6 @@ import Utility.DBus
 import DBus.Client
 import DBus
 import Data.Word (Word32)
-import qualified Control.Exception as E
 #else
 #warning Building without dbus support; will poll for network connection changes
 #endif
@@ -57,22 +56,24 @@ netWatcherFallbackThread st dstatus scanremotes = thread $
 #if WITH_DBUS
 
 dbusThread :: ThreadState -> DaemonStatusHandle -> ScanRemoteMap -> IO ()
-dbusThread st dstatus scanremotes = E.catch (runClient getSystemAddress go) onerr
+dbusThread st dstatus scanremotes = persistentClient getSystemAddress () onerr go
 	where
 		go client = ifM (checkNetMonitor client)
 			( do
-				listenNMConnections client handle
-				listenWicdConnections client handle
+				listenNMConnections client handleconn
+				listenWicdConnections client handleconn
 			, do
 				runThreadState st $
 					warning "No known network monitor available through dbus; falling back to polling"
 			)
-		onerr :: E.SomeException -> IO ()
-		onerr e = runThreadState st $
-			warning $ "dbus failed; falling back to polling (" ++ show e ++ ")"
-		handle = do
+		handleconn = do
 			debug thisThread ["detected network connection"]
 			handleConnection st dstatus scanremotes
+		onerr e _ = do
+			runThreadState st $
+				warning $ "lost dbus connection; falling back to polling (" ++ show e ++ ")"
+			{- Wait, in hope that dbus will come back -}
+			threadDelaySeconds (Seconds 60)
 
 {- Examine the list of services connected to dbus, to see if there
  - are any we can use to monitor network connections. -}
-- 
cgit v1.2.3