033e4b086fMade all uses of openFd and dup set the close-on-exec flag, with a few exceptions when starting a git-annex daemon. Made openFdWithMode be used everywhere, rather than openFd. Adding a new parameter to it ensures I checked everything. And will help to make sure this gets considered in the future when opening fds. In lockPidFile, the only thing that keeps the pid file locked, once daemonize re-runs the command in a new session, is that the fd is inherited. In Utility.LogFile.redir, the new fd it dups to does not have the close-on-exec flag set, because this is used to set up the stdout and stderr fds, which need to be inherited by child processes. Same in Assistant.startDaemon where the browser gets started with the original stdout and stderr. This does nothing about uses of openFile and similar! Sponsored-By: mycroft
40 lines
1 KiB
Haskell
40 lines
1 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2014-2016 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
module Command.RemoteDaemon where
|
|
|
|
import Command
|
|
import RemoteDaemon.Core
|
|
import Utility.Daemon
|
|
#ifndef mingw32_HOST_OS
|
|
import Annex.Path
|
|
import Utility.OpenFd
|
|
#endif
|
|
|
|
cmd :: Command
|
|
cmd = noCommit $
|
|
command "remotedaemon" SectionCommon
|
|
"persistent communication with remotes"
|
|
paramNothing (run <$$> const (parseDaemonOptions False))
|
|
|
|
run :: DaemonOptions -> CommandSeek
|
|
run o
|
|
| stopDaemonOption o = giveup "--stop not implemented for remotedaemon"
|
|
| foregroundDaemonOption o = liftIO runInteractive
|
|
| otherwise = do
|
|
#ifndef mingw32_HOST_OS
|
|
git_annex <- fromOsPath <$> liftIO programPath
|
|
ps <- gitAnnexDaemonizeParams
|
|
let logfd = openFdWithMode (toRawFilePath "/dev/null") ReadOnly Nothing
|
|
defaultFileFlags
|
|
(CloseOnExecFlag True)
|
|
liftIO $ daemonize git_annex ps logfd Nothing False runNonInteractive
|
|
#else
|
|
liftIO $ foreground Nothing runNonInteractive
|
|
#endif
|