From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH] daemon: expand @ARGV paths for running in '/'
Date: Thu, 17 Mar 2016 01:59:10 +0000 [thread overview]
Message-ID: <20160317015910.27547-1-e@80x24.org> (raw)
We also require --stdout/--stderr/--pid-file to be absolute
paths for USR2 usage. However, allow PSGI files for -httpd
to be relative paths for ease-of-use.
---
lib/PublicInbox/Daemon.pm | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index c6fb62b..c9594a3 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -8,6 +8,7 @@ use warnings;
use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
use IO::Handle;
use IO::Socket;
+use Cwd qw/abs_path/;
STDOUT->autoflush(1);
STDERR->autoflush(1);
require Danga::Socket;
@@ -91,7 +92,24 @@ sub daemon_prepare ($) {
die "No listeners bound\n" unless @listeners;
}
+sub check_absolute ($$) {
+ my ($var, $val) = @_;
+ if (defined $val && index($val, '/') != 0) {
+ die
+"--$var must be an absolute path when using --daemonize: $val\n";
+ }
+}
+
sub daemonize () {
+ foreach my $i (0..$#ARGV) {
+ my $arg = $ARGV[$i];
+ next unless -e $arg;
+ $ARGV[$i] = abs_path($arg);
+ }
+ check_absolute('stdout', $stdout);
+ check_absolute('stderr', $stderr);
+ check_absolute('pid-file', $pid_file);
+
chdir '/' or die "chdir failed: $!";
open(STDIN, '+<', '/dev/null') or die "redirect stdin failed: $!";
--
EW
reply other threads:[~2016-03-17 1:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160317015910.27547-1-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).