Patchwork [4,of,4] inotify: don't pass pidfile option to child

login
register
mail settings
Submitter Siddharth Agarwal
Date Oct. 2, 2013, 11:19 p.m.
Message ID <104ddc0c8ccaeb22fc01.1380755986@dev1091.prn1.facebook.com>
Download mbox | patch
Permalink /patch/2716/
State Accepted
Commit 4210a05c4329fdca4fea2bbdc5859b740b638e31
Headers show

Comments

Siddharth Agarwal - Oct. 2, 2013, 11:19 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1380749065 25200
#      Wed Oct 02 14:24:25 2013 -0700
# Node ID 104ddc0c8ccaeb22fc01a285b08db1cd2e86561f
# Parent  567a2b3f19214d776ca20ac0e44b206b75e6580c
inotify: don't pass pidfile option to child

The child no longer needs it.
Augie Fackler - Oct. 3, 2013, 2:48 p.m.
On Wed, Oct 02, 2013 at 04:19:46PM -0700, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1380749065 25200
> #      Wed Oct 02 14:24:25 2013 -0700
> # Node ID 104ddc0c8ccaeb22fc01a285b08db1cd2e86561f
> # Parent  567a2b3f19214d776ca20ac0e44b206b75e6580c
> inotify: don't pass pidfile option to child

Looks reasonable, queued

>
> The child no longer needs it.
>
> diff --git a/hgext/inotify/server.py b/hgext/inotify/server.py
> --- a/hgext/inotify/server.py
> +++ b/hgext/inotify/server.py
> @@ -454,7 +454,6 @@
>      opts.setdefault('pid_file', '')
>      if opts['daemon'] and pidfile is not None and not opts['pid_file']:
>          opts['pid_file'] = pidfile
> -        runargs.append("--pid-file=%s" % pidfile)
>
>      service = service()
>      logfile = ui.config('inotify', 'log')
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/hgext/inotify/server.py b/hgext/inotify/server.py
--- a/hgext/inotify/server.py
+++ b/hgext/inotify/server.py
@@ -454,7 +454,6 @@ 
     opts.setdefault('pid_file', '')
     if opts['daemon'] and pidfile is not None and not opts['pid_file']:
         opts['pid_file'] = pidfile
-        runargs.append("--pid-file=%s" % pidfile)
 
     service = service()
     logfile = ui.config('inotify', 'log')