
* unannex, uninit: Avoid committing after every file is unannexed, for massive speedup. * --notify-finish switch will cause desktop notifications after each file upload/download/drop completes (using the dbus Desktop Notifications Specification) * --notify-start switch will show desktop notifications when each file upload/download starts. * webapp: Automatically install Nautilus integration scripts to get and drop files. * tahoe: Pass -d parameter before subcommand; putting it after the subcommand no longer works with tahoe-lafs version 1.10. (Thanks, Alberto Berti) * forget --drop-dead: Avoid removing the dead remote from the trust.log, so that if git remotes for it still exist anywhere, git annex info will still know it's dead and not show it. * git-annex-shell: Make configlist automatically initialize a remote git repository, as long as a git-annex branch has been pushed to it, to simplify setup of remote git repositories, including via gitolite. * add --include-dotfiles: New option, perhaps useful for backups. * Version 5.20140227 broke creation of glacier repositories, not including the datacenter and vault in their configuration. This bug is fixed, but glacier repositories set up with the broken version of git-annex need to have the datacenter and vault set in order to be usable. This can be done using git annex enableremote to add the missing settings. For details, see http://git-annex.branchable.com/bugs/problems_with_glacier/ * Added required content configuration. * assistant: Improve ssh authorized keys line generated in local pairing or for a remote ssh server to set environment variables in an alternative way that works with the non-POSIX fish shell, as well as POSIX shells. # imported from the archive
140 lines
4 KiB
Haskell
140 lines
4 KiB
Haskell
{- git-annex assistant network connection watcher, using dbus
|
|
-
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
{-# LANGUAGE OverloadedStrings #-}
|
|
|
|
module Assistant.Threads.NetWatcher where
|
|
|
|
import Assistant.Common
|
|
import Assistant.Sync
|
|
import Utility.ThreadScheduler
|
|
import qualified Types.Remote as Remote
|
|
import Assistant.DaemonStatus
|
|
import Utility.NotificationBroadcaster
|
|
|
|
#if WITH_DBUS
|
|
import Utility.DBus
|
|
import DBus.Client
|
|
import DBus
|
|
import Data.Word (Word32)
|
|
import Assistant.NetMessager
|
|
#else
|
|
#ifdef linux_HOST_OS
|
|
#warning Building without dbus support; will poll for network connection changes
|
|
#endif
|
|
#endif
|
|
|
|
netWatcherThread :: NamedThread
|
|
#if WITH_DBUS
|
|
netWatcherThread = thread dbusThread
|
|
#else
|
|
netWatcherThread = thread noop
|
|
#endif
|
|
where
|
|
thread = namedThread "NetWatcher"
|
|
|
|
{- This is a fallback for when dbus cannot be used to detect
|
|
- network connection changes, but it also ensures that
|
|
- any networked remotes that may have not been routable for a
|
|
- while (despite the local network staying up), are synced with
|
|
- periodically.
|
|
-
|
|
- Note that it does not call notifyNetMessagerRestart, because
|
|
- it doesn't know that the network has changed.
|
|
-}
|
|
netWatcherFallbackThread :: NamedThread
|
|
netWatcherFallbackThread = namedThread "NetWatcherFallback" $
|
|
runEvery (Seconds 3600) <~> handleConnection
|
|
|
|
#if WITH_DBUS
|
|
|
|
dbusThread :: Assistant ()
|
|
dbusThread = do
|
|
handleerr <- asIO2 onerr
|
|
runclient <- asIO1 go
|
|
liftIO $ persistentClient getSystemAddress () handleerr runclient
|
|
where
|
|
go client = ifM (checkNetMonitor client)
|
|
( do
|
|
listenNMConnections client <~> handleconn
|
|
listenWicdConnections client <~> handleconn
|
|
, do
|
|
liftAnnex $
|
|
warning "No known network monitor available through dbus; falling back to polling"
|
|
)
|
|
handleconn = do
|
|
debug ["detected network connection"]
|
|
notifyNetMessagerRestart
|
|
handleConnection
|
|
onerr e _ = do
|
|
liftAnnex $
|
|
warning $ "lost dbus connection; falling back to polling (" ++ show e ++ ")"
|
|
{- Wait, in hope that dbus will come back -}
|
|
liftIO $ threadDelaySeconds (Seconds 60)
|
|
|
|
{- Examine the list of services connected to dbus, to see if there
|
|
- are any we can use to monitor network connections. -}
|
|
checkNetMonitor :: Client -> Assistant Bool
|
|
checkNetMonitor client = do
|
|
running <- liftIO $ filter (`elem` [networkmanager, wicd])
|
|
<$> listServiceNames client
|
|
case running of
|
|
[] -> return False
|
|
(service:_) -> do
|
|
debug [ "Using running DBUS service"
|
|
, service
|
|
, "to monitor network connection events."
|
|
]
|
|
return True
|
|
where
|
|
networkmanager = "org.freedesktop.NetworkManager"
|
|
wicd = "org.wicd.daemon"
|
|
|
|
{- Listens for new NetworkManager connections. -}
|
|
listenNMConnections :: Client -> IO () -> IO ()
|
|
listenNMConnections client callback =
|
|
listen client matcher $ \event ->
|
|
when (Just True == anyM activeconnection (signalBody event)) $
|
|
callback
|
|
where
|
|
matcher = matchAny
|
|
{ matchInterface = Just "org.freedesktop.NetworkManager.Connection.Active"
|
|
, matchMember = Just "PropertiesChanged"
|
|
}
|
|
nm_connection_activated = toVariant (2 :: Word32)
|
|
nm_state_key = toVariant ("State" :: String)
|
|
activeconnection v = do
|
|
m <- fromVariant v
|
|
vstate <- lookup nm_state_key $ dictionaryItems m
|
|
state <- fromVariant vstate
|
|
return $ state == nm_connection_activated
|
|
|
|
{- Listens for new Wicd connections. -}
|
|
listenWicdConnections :: Client -> IO () -> IO ()
|
|
listenWicdConnections client callback =
|
|
listen client matcher $ \event ->
|
|
when (any (== wicd_success) (signalBody event)) $
|
|
callback
|
|
where
|
|
matcher = matchAny
|
|
{ matchInterface = Just "org.wicd.daemon"
|
|
, matchMember = Just "ConnectResultsSent"
|
|
}
|
|
wicd_success = toVariant ("success" :: String)
|
|
|
|
#endif
|
|
|
|
handleConnection :: Assistant ()
|
|
handleConnection = do
|
|
liftIO . sendNotification . networkConnectedNotifier =<< getDaemonStatus
|
|
reconnectRemotes True =<< networkRemotes
|
|
|
|
{- Network remotes to sync with. -}
|
|
networkRemotes :: Assistant [Remote]
|
|
networkRemotes = filter (isNothing . Remote.localpath) . syncRemotes
|
|
<$> getDaemonStatus
|