Fix zombie process that occurred when switching between repository views in the webapp.
This commit is contained in:
parent
a83dca0a58
commit
1f39aef893
3 changed files with 10 additions and 2 deletions
|
@ -61,8 +61,12 @@ getSwitchToRepositoryR repo = do
|
||||||
threadDelay 100000 -- 1/10th of a second
|
threadDelay 100000 -- 1/10th of a second
|
||||||
a
|
a
|
||||||
|
|
||||||
|
{- Returns once the assistant has daemonized, but possibly before it's
|
||||||
|
- listening for web connections. -}
|
||||||
startAssistant :: FilePath -> IO ()
|
startAssistant :: FilePath -> IO ()
|
||||||
startAssistant repo = do
|
startAssistant repo = do
|
||||||
program <- readProgramFile
|
program <- readProgramFile
|
||||||
void $ forkIO $ void $ createProcess $
|
(_, _, _, pid) <-
|
||||||
(proc program ["assistant"]) { cwd = Just repo }
|
createProcess $
|
||||||
|
(proc program ["assistant"]) { cwd = Just repo }
|
||||||
|
void $ checkSuccessProcess pid
|
||||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -9,6 +9,8 @@ git-annex (4.20131102) UNRELEASED; urgency=low
|
||||||
* Fix enabling of gcrypt repository accessed over ssh;
|
* Fix enabling of gcrypt repository accessed over ssh;
|
||||||
git-annex-shell gcryptsetup had a bug that caused it to fail
|
git-annex-shell gcryptsetup had a bug that caused it to fail
|
||||||
with permission denied.
|
with permission denied.
|
||||||
|
* Fix zombie process that occurred when switching between repository
|
||||||
|
views in the webapp.
|
||||||
|
|
||||||
-- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400
|
-- Joey Hess <joeyh@debian.org> Sat, 02 Nov 2013 14:54:36 -0400
|
||||||
|
|
||||||
|
|
|
@ -40,3 +40,5 @@ git-annex assistant is currently running. Here is the output of **ps -A u | gre
|
||||||
31812 pts/2 Z 0:00 [git-annex] <defunct>
|
31812 pts/2 Z 0:00 [git-annex] <defunct>
|
||||||
31835 ? Ss 0:02 ssh: .git/annex/ssh/example.net [mux]
|
31835 ? Ss 0:02 ssh: .git/annex/ssh/example.net [mux]
|
||||||
"""]]
|
"""]]
|
||||||
|
|
||||||
|
> [[fixed|done]] --[[Joey]]
|
||||||
|
|
Loading…
Reference in a new issue