135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more fixes for LSB init functionality

Browse Source
This commit is contained in:
Oliver Gorwits
2014-04-18 22:00:32 +00:00
parent 52b754ed0c
commit 9fa855ceb8
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Netdisco/bin/netdisco-daemon
View File

@@ -9,12 +9,15 @@ BEGIN {
use FindBin; use FindBin;
FindBin::again(); FindBin::again();
$home = ($ENV{NETDISCO_HOME} || $ENV{HOME}); my $me = File::Spec->catfile($FindBin::RealBin, $FindBin::RealScript);
my $uid = (stat($me))[4] || 0;
$home = ($ENV{NETDISCO_HOME} || (getpwuid($uid))[7] || $ENV{HOME});
# try to find a localenv if one isn't already in place. # try to find a localenv if one isn't already in place.
if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) { if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
use File::Spec; use File::Spec;
my $localenv = File::Spec->catfile($FindBin::RealBin, 'localenv'); my $localenv = File::Spec->catfile($FindBin::Bin, 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
$localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv'); $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
@@ -58,6 +61,7 @@ Daemon::Control->new({
pid_file => file($home, 'netdisco-daemon.pid'), pid_file => file($home, 'netdisco-daemon.pid'),
stderr_file => file($log_dir, 'netdisco-daemon.log'), stderr_file => file($log_dir, 'netdisco-daemon.log'),
stdout_file => file($log_dir, 'netdisco-daemon.log'), stdout_file => file($log_dir, 'netdisco-daemon.log'),
redirect_before_fork => 0,
uid => $uid, gid => $gid, uid => $uid, gid => $gid,
})->run; })->run;
@@ -66,7 +70,7 @@ Daemon::Control->new({
sub restarter { sub restarter {
my ($daemon, @program_args) = @_; my ($daemon, @program_args) = @_;
my $child = fork_and_start(@program_args); my $child = fork_and_start($daemon, @program_args);
exit(1) unless $child; exit(1) unless $child;
my $watcher = Filesys::Notify::Simple->new([$ENV{DANCER_ENVDIR}]); my $watcher = Filesys::Notify::Simple->new([$ENV{DANCER_ENVDIR}]);
@@ -95,11 +99,12 @@ sub restarter {
} }
sub fork_and_start { sub fork_and_start {
my @daemon_args = @_; my ($daemon, @daemon_args) = @_;
my $pid = fork; my $pid = fork;
die "Can't fork: $!" unless defined $pid; die "Can't fork: $!" unless defined $pid;
if ($pid == 0) { # child if ($pid == 0) { # child
$daemon->redirect_filehandles();
exec( $netdisco->stringify, @daemon_args ); exec( $netdisco->stringify, @daemon_args );
} }
else { else {

13
Netdisco/bin/netdisco-web
View File

@@ -9,12 +9,15 @@ BEGIN {
use FindBin; use FindBin;
FindBin::again(); FindBin::again();
$home = ($ENV{NETDISCO_HOME} || $ENV{HOME}); my $me = File::Spec->catfile($FindBin::RealBin, $FindBin::RealScript);
my $uid = (stat($me))[4] || 0;
$home = ($ENV{NETDISCO_HOME} || (getpwuid($uid))[7] || $ENV{HOME});
# try to find a localenv if one isn't already in place. # try to find a localenv if one isn't already in place.
if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) { if (!exists $ENV{PERL_LOCAL_LIB_ROOT}) {
use File::Spec; use File::Spec;
my $localenv = File::Spec->catfile($FindBin::RealBin, 'localenv'); my $localenv = File::Spec->catfile($FindBin::Bin, 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
$localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv'); $localenv = File::Spec->catfile($home, 'perl5', 'bin', 'localenv');
exec($localenv, $0, @ARGV) if -f $localenv; exec($localenv, $0, @ARGV) if -f $localenv;
@@ -62,6 +65,7 @@ Daemon::Control->new({
pid_file => file($home, 'netdisco-web.pid'), pid_file => file($home, 'netdisco-web.pid'),
stderr_file => file($log_dir, 'netdisco-web.log'), stderr_file => file($log_dir, 'netdisco-web.log'),
stdout_file => file($log_dir, 'netdisco-web.log'), stdout_file => file($log_dir, 'netdisco-web.log'),
redirect_before_fork => 0,
})->run; })->run;
# the guts of this are borrowed from Plack::Loader::Restarter - many thanks!! # the guts of this are borrowed from Plack::Loader::Restarter - many thanks!!
@@ -69,7 +73,7 @@ Daemon::Control->new({
sub restarter { sub restarter {
my ($daemon, @program_args) = @_; my ($daemon, @program_args) = @_;
my $child = fork_and_start(@program_args); my $child = fork_and_start($daemon, @program_args);
exit(1) unless $child; exit(1) unless $child;
my $watcher = Filesys::Notify::Simple->new([$ENV{DANCER_ENVDIR}]); my $watcher = Filesys::Notify::Simple->new([$ENV{DANCER_ENVDIR}]);
@@ -98,11 +102,12 @@ sub restarter {
} }
sub fork_and_start { sub fork_and_start {
my @starman_args = @_; my ($daemon, @starman_args) = @_;
my $pid = fork; my $pid = fork;
die "Can't fork: $!" unless defined $pid; die "Can't fork: $!" unless defined $pid;
if ($pid == 0) { # child if ($pid == 0) { # child
$daemon->redirect_filehandles();
exec( 'starman', @starman_args ); exec( 'starman', @starman_args );
} }
else { else {

7
Netdisco/lib/App/Netdisco/Environment.pm
View File

@@ -5,13 +5,18 @@ use warnings;
use File::ShareDir 'dist_dir'; use File::ShareDir 'dist_dir';
use Path::Class; use Path::Class;
use FindBin;
BEGIN { BEGIN {
if (not ($ENV{DANCER_APPDIR} || '') if (not ($ENV{DANCER_APPDIR} || '')
or not -f file($ENV{DANCER_APPDIR}, 'config.yml')) { or not -f file($ENV{DANCER_APPDIR}, 'config.yml')) {
FindBin::again();
my $me = File::Spec->catfile($FindBin::RealBin, $FindBin::RealScript);
my $uid = (stat($me))[4] || 0;
my $home = ($ENV{NETDISCO_HOME} || (getpwuid($uid))[7] || $ENV{HOME});
my $auto = dir(dist_dir('App-Netdisco'))->absolute; my $auto = dir(dist_dir('App-Netdisco'))->absolute;
my $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
$ENV{DANCER_APPDIR} ||= $auto->stringify; $ENV{DANCER_APPDIR} ||= $auto->stringify;
$ENV{DANCER_CONFDIR} ||= $auto->stringify; $ENV{DANCER_CONFDIR} ||= $auto->stringify;