# +------------------------------------+
#
# InspIRCd: (C) 2002-2009 InspIRCd Development Team
-# See: http://www.inspircd.org/wiki/index.php/Credits
+# See: http://wiki.inspircd.org/Credits
#
# This program is free but copyrighted software; see
# the file COPYING for details.
my $basepath = "@BASE_DIR@";
my $confpath = "@CONFIG_DIR@/";
my $binpath = "@BINARY_DIR@";
-my $libpath = "@LIBRARY_DIR@";
+my $runpath = "@BASE_DIR@";
my $valgrindlogpath = "$basepath/valgrindlogs";
my $executable = "@EXECUTABLE@";
my $version = "@VERSION@";
our($pid,$pidfile);
# Lets see what they want to do.. Set the variable (Cause i'm a lazy coder)
my $arg = shift(@ARGV);
-my $conf = $confpath . "inspircd.conf";
+my $conf;
for my $a (@ARGV)
{
if ($a =~ m/^--config=(.*)$/)
last;
}
}
+if (!defined $conf) {
+ $conf = $confpath . "inspircd.conf";
+ push @ARGV, '--config='.$conf;
+}
+
getpidfile($conf);
# System for naming script command subs:
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
# If we are still alive here.. Try starting the IRCd..
+ chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
- exec { "$binpath/$executable" } "$binpath/$executable", @_;
+ exec "$binpath/$executable", @_;
die "Failed to start IRCd: $!\n";
}
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
#Check we have gdb
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
checkgdb();
# If we are still alive here.. Try starting the IRCd..
- # May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
- # Could be useful when we want to stop it complaining about things we're sure aren't issues.
#
# NOTE: Saving the debug log (redirected stdout), while useful, is a potential security risk AND one hell of a spacehog. DO NOT SAVE THIS WHERE EVERYONE HAS ACCESS!
# Redirect stdout to /dev/null if you're worried about the security.
if ($pid == 0) {
POSIX::setsid();
-d $valgrindlogpath or mkdir $valgrindlogpath or die "Cannot create $valgrindlogpath: $!\n";
+ -e "$binpath/valgrind.sup" or do { open my $f, '>', "$binpath/valgrind.sup"; };
my $suffix = strftime("%Y%m%d-%H%M%S", localtime(time)) . ".$$";
open STDIN, '<', '/dev/null' or die "Can't redirect STDIN to /dev/null: $!\n";
sysopen STDOUT, "$valgrindlogpath/out.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0600 or die "Can't open $valgrindlogpath/out.$suffix: $!\n";
sysopen STDERR, "$valgrindlogpath/valdebug.$suffix", O_WRONLY | O_CREAT | O_NOCTTY | O_APPEND, 0666 or die "Can't open $valgrindlogpath/valdebug.$suffix: $!\n";
- exec qw(valgrind -v --tool=memcheck --leak-check=yes --num-callers=10 --time-stamp=yes --log-fd=2), "$binpath/$executable", qw(-nofork -debug -nolog), @_;
+ # May want to do something with these args at some point: --suppressions=.inspircd.sup --gen-suppressions=yes
+ # Could be useful when we want to stop it complaining about things we're sure aren't issues.
+ exec qw(valgrind -v --tool=memcheck --leak-check=full --show-reachable=yes --num-callers=15 --track-fds=yes),
+ "--suppressions=$binpath/valgrind.sup", qw(--gen-suppressions=all),
+ qw(--leak-resolution=med --time-stamp=yes --log-fd=2 --),
+ "$binpath/$executable", qw(-nofork -debug -nolog), @_;
die "Can't execute valgrind: $!\n";
}
}
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ chdir $runpath;
print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
print "$binpath/$executable is not executable\n" and return 0 unless(-f "$binpath/$executable" && -x "$binpath/$executable");
# Get to here, we have something to kill.
my $pid = getprocessid();
print "Stopping InspIRCd (pid: $pid)...\n";
- my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 30 : 5;
+ my $maxwait = (`ps -o command $pid` =~ /valgrind/i) ? 90 : 5;
kill TERM => $pid or die "Cannot terminate IRCd: $!\n";
for (1..$maxwait) {
sleep 1;
}
print "InspIRCd not dying quietly -- forcing kill\n";
kill KILL => $pid;
- exit 0;
+ return 0;
}
###
# Are We using a relative path?
if ($file !~ /^\//) {
# Convert it to a full path.
- $file = $confpath . $file;
+ $file = $runpath .'/'. $file;
}
# Have we checked this file before?
$filesparsed{$file} = 1;
# Open the File..
- open INFILE, "< $file" or die "Unable to open file $file included in configuration\n";
+ open INFILE, '<', $file or return;
# Grab entire file contents..
my(@lines) = <INFILE>;
# Close the file
{
# Set the PID file and return.
$pidfile = $1;
+ if (-f $pidfile)
+ {
+ return;
+ }
+ elsif (-f "$runpath/$pidfile")
+ {
+ $pidfile = "$runpath/$pidfile";
+ return;
+ }
return;
}
}
+
# If we get here, NO PID FILE! -- Check for includes
for my $i (@lines) {
$i =~ s/[^=]+=\s(.*)/\1/;
}
# End of includes / No includes found. Using default.
- $pidfile = $confpath . "inspircd.pid";
+ $pidfile = $runpath . "/data/inspircd.pid";
}
sub getstatus {
# Are We using a relative path?
if ($file !~ /^\//) {
# Convert it to a full path..
- $file = $confpath . $file;
+ $file = $runpath . $file;
}
# Have we checked this file before?
projects / user / henk / code / inspircd.git / blobdiff