summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-26 23:07:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-26 23:07:30 -0400
commit7f634962298bd086c485dd4080dc930cb3603491 (patch)
tree37655a26d7ea9170bf32651585e2f6bd8f5992c2 /Assistant.hs
parent117df9c3714f2366d4f10d63fce41a608d96308e (diff)
gnutls segfault fixed
Adjust build deps to ensure that only a fixed version of the library will be used. Also, removed the bound thread stuff, which I now think was (probably) a red herring.
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs10
1 files changed, 4 insertions, 6 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 0fdda6997..acb9453f3 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -216,17 +216,15 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do
, assist $ transferScannerThread st dstatus scanremotes transferqueue
, assist $ configMonitorThread st dstatus branchhandle commitchan
#ifdef WITH_XMPP
- {- Bound thread, because TLS needs it. -}
- , bound $ assist $ pushNotifierThread st dstatus pushnotifier
+ , assist $ pushNotifierThread st dstatus pushnotifier
#endif
, watch $ watchThread st dstatus transferqueue changechan
]
waitForTermination
- watch a = (forkIO, True, a)
- assist a = (forkIO, False, a)
- bound (_, watcher, t) = (forkOS, watcher, t)
+ watch a = (True, a)
+ assist a = (False, a)
startthread dstatus (runner, watcher, t)
- | watcher || assistant = void $ runner $
+ | watcher || assistant = void $ forkIO $
runNamedThread dstatus t
| otherwise = noop