# I HATE PERL.. kthxbye
# ---------------------------------------------------
-my $confpath = "@CONFIG_DIR@/";
-my $binpath = "@BINARY_DIR@";
-my $libpath = "@LIBRARY_DIR@";
-my $executable = "@EXECUTABLE@";
+my $basepath = "@BASE_DIR@";
+my $confpath = "@CONFIG_DIR@/";
+my $binpath = "@BINARY_DIR@";
+my $libpath = "@LIBRARY_DIR@";
+my $executable = "@EXECUTABLE@";
+my $version = "@VERSION@";
my @filesparsed;
# Lets see what they want to do.. Set the variable (Cause i'm a lazy coder)
if (getstatus() == 1) {
my $pid = getprocessid();
system("kill -HUP $pid >/dev/null 2>&1");
- print "InspIRCd rehashed.\n";
+ print "InspIRCd rehashed (pid: $pid).\n";
exit();
} else {
print "InspIRCd is not running. (Or PID File not found)\n";
exit();
}
+if ($arg eq "version") {
+ print "InspIRCd version: $version\n";
+ exit();
+}
+
if ($arg eq "restart") {
stop();
unlink($pidfile) if (-e $pidfile);
# If we get here.. bad / no parameters.
###
print "Invalid Argument: $arg\n";
-print "Usage: inspircd (start|stop|restart|rehash|status|cron)\n";
+print "Usage: inspircd (start|stop|restart|rehash|status|cron|version)\n";
exit();
###
# 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..
+ print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+
system("$binpath/$executable");
return 1;
}
sub debug {
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
-
+
+ print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+
# Check we have gdb
checkgdb();
# If we are still alive here.. Try starting the IRCd..
- system("gdb --command=.gdbargs --args $binpath/$executable -nofork -debug -nolog");
+ system("gdb --command=$basepath/.gdbargs --args $binpath/$executable -nofork -debug -nolog");
}
sub screendebug
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+
#Check we have gdb
checkgdb();
checkscreen();
# If we are still alive here.. Try starting the IRCd..
print "Starting InspIRCd in `screen`, type `screen -r` when the ircd crashes to view the gdb output and get a backtrace.\n";
print "Once you're inside the screen session press ^C + d to re-detach from the session\n";
- system("screen -m -d gdb --command=.gdbargs --args $binpath/$executable -nofork -debug -nolog");
+ system("screen -m -d gdb --command=$basepath/.gdbargs --args $binpath/$executable -nofork -debug -nolog");
}
sub valdebug
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+
# Check we have valgrind and gdb
checkvalgrind();
checkgdb();
# Check to see its not 'running' already.
if (getstatus() == 1) { print "InspIRCd is already running.\n"; return 0; }
+ print "$binpath/$executable doesn't exist\n" and return 0 unless(-e "$binpath/$executable");
+
#Check we have gdb
checkvalgrind();
checkgdb();
if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)\n"; return 0; }
# Get to here, we have something to kill.
my $pid = getprocessid();
- print "Stopping InspIRCd...\n";
+ print "Stopping InspIRCd (pid: $pid)...\n";
system("kill -TERM $pid >/dev/null 2>&1");
+ # Give it a second to exit
+ sleep(1);
if (getstatus() == 1)
{
- print "InspIRCd not dying Quietly -- Forcing Kill\n";
+ print "InspIRCd not dying quietly -- forcing kill\n";
system("kill -9 $pid >/dev/null 2>&1");
}
print "InspIRCd Stopped.\n";
# when it is added, it comes around and BITES ME IN THE ASS,
# because i then have to code support into this script.. Evil.
+# Craig got bitten in the ass again --
+# in 1.1 beta the include file is manditory, therefore
+# if we cant find it, default to %conf%/inspircd.pid.
+# Note, this also contains a fix for when the pid file is
+# defined, but defined in a comment (line starts with #)
+# -- Brain
+
sub getpidfile {
my ($file) = @_;
# Before we start, do we have a PID already? (Should never occur)
$filesparsed[$filesparsed] = $file;
# Open the File..
- open INFILE, "< $file" or die "Unable to Open file $file\n";
+ open INFILE, "< $file" or die "Unable to open file $file\n";
# Grab entire file contents..
my(@lines) = <INFILE>;
# Close the file
close INFILE;
- # Clean up the file, no newlines etc..
+ # remove trailing spaces
chomp(@lines);
foreach $i (@lines) {
+ # clean it up
$i =~ s/[^=]+=\s(.*)/\1/;
- }
- my $tmp = join("",@lines);
-
- # Does this file have a pid?
- if ($tmp =~ /<pid file=\"(\S+)\">/i) {
- # Set the PID file and return.
- $pidfile = $1;
- return;
+ # Does this file have a pid?
+ if (($i =~ /<pid file=\"(\S+)\">/i) && ($i !~ /^#/))
+ {
+ # Set the PID file and return.
+ $pidfile = $1;
+ return;
+ }
}
- # If we get here, NO PID FILE! -- Check for includes (Seeing as we will eventually return,
- # The while (1) is safe.)
- while (1) {
- if ($tmp =~ s/\<include file=\"(.+?)\"\>//i)
+ # If we get here, NO PID FILE! -- Check for includes
+ foreach $i (@lines) {
+ $i =~ s/[^=]+=\s(.*)/\1/;
+ if (($i =~ s/\<include file=\"(.+?)\"\>//i) && ($i !~ /^#/))
{
# Decend into that file, and check for PIDs.. (that sounds like an STD ;/)
getpidfile($1);
# Yes, Return.
return;
}
- } else {
- # End of includes / No includes found.
- return;
}
}
+
+ # End of includes / No includes found. Using default.
+ $pidfile = $confpath . "inspircd.pid";
}
sub getstatus {
projects / user / henk / code / inspircd.git / blobdiff