Ignore setsid failures.
This commit is contained in:
parent
b6274745b4
commit
787d9e27ba
3 changed files with 10 additions and 2 deletions
|
@ -39,7 +39,7 @@ daemonize logfd pidfile changedirectory a = do
|
||||||
checkalreadyrunning f = maybe noop (const alreadyRunning)
|
checkalreadyrunning f = maybe noop (const alreadyRunning)
|
||||||
=<< checkDaemon f
|
=<< checkDaemon f
|
||||||
child1 = do
|
child1 = do
|
||||||
_ <- createSession
|
_ <- tryIO createSession
|
||||||
_ <- forkProcess child2
|
_ <- forkProcess child2
|
||||||
out
|
out
|
||||||
child2 = do
|
child2 = do
|
||||||
|
@ -59,7 +59,7 @@ daemonize logfd pidfile changedirectory a = do
|
||||||
foreground :: Fd -> Maybe FilePath -> IO () -> IO ()
|
foreground :: Fd -> Maybe FilePath -> IO () -> IO ()
|
||||||
foreground logfd pidfile a = do
|
foreground logfd pidfile a = do
|
||||||
maybe noop lockPidFile pidfile
|
maybe noop lockPidFile pidfile
|
||||||
_ <- createSession
|
_ <- tryIO createSession
|
||||||
redirLog logfd
|
redirLog logfd
|
||||||
a
|
a
|
||||||
exitImmediately ExitSuccess
|
exitImmediately ExitSuccess
|
||||||
|
|
6
debian/changelog
vendored
6
debian/changelog
vendored
|
@ -1,3 +1,9 @@
|
||||||
|
git-annex (5.20140607) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
|
* Ignore setsid failures.
|
||||||
|
|
||||||
|
-- Joey Hess <joeyh@debian.org> Mon, 09 Jun 2014 14:44:09 -0400
|
||||||
|
|
||||||
git-annex (5.20140606) unstable; urgency=medium
|
git-annex (5.20140606) unstable; urgency=medium
|
||||||
|
|
||||||
* webapp: When adding a new local repository, fix bug that caused its
|
* webapp: When adding a new local repository, fix bug that caused its
|
||||||
|
|
|
@ -29,3 +29,5 @@ WebApp crashed: createSession: permission denied (Operation not permitted)
|
||||||
$
|
$
|
||||||
# End of transcript or log.
|
# End of transcript or log.
|
||||||
"""]]
|
"""]]
|
||||||
|
|
||||||
|
> provisionally fixed; [[done]] --[[Joey]]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue