Add r5381 fix to remote rehash too

[user/henk/code/inspircd.git] / .inspircd.inc

diff --git a/.inspircd.inc b/.inspircd.inc
index 03be874c69c669059990fbe85f0c63158fd8dfd5..87a162a31b12699a51a3ee03672e678574694b7d 100644 (file)
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -15,6 +15,7 @@
 #               I HATE PERL.. kthxbye
 # ---------------------------------------------------
 
+my $basepath = "@BASE_DIR@";
 my $confpath = "@CONFIG_DIR@/";
 my $binpath = "@BINARY_DIR@";
 my $libpath = "@LIBRARY_DIR@";
@@ -27,6 +28,9 @@ getpidfile($confpath."inspircd.conf");
 
 if ($arg eq "start") { start(); exit(); }
 if ($arg eq "debug") { debug(); exit(); }
+if ($arg eq "screendebug") { screendebug(); exit() }
+if ($arg eq "valdebug") { valdebug(); exit(); }
+if ($arg eq "screenvaldebug") { screenvaldebug(); exit(); }
 if ($arg eq "stop") { stop(); exit(); }
 if ($arg eq "status") {
        if (getstatus() == 1) { 
@@ -57,6 +61,7 @@ if ($arg eq "cron") {
 
 if ($arg eq "restart") {
        stop();
+       unlink($pidfile) if (-e $pidfile);
        start();
        # kthxbye();
        exit();
@@ -83,17 +88,76 @@ sub start {
         # 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; }
-        # If we are still alive here.. Try starting the IRCd..
-        system("gdb --command=.gdbargs --args $binpath/$executable -nofork -debug -nolog");
+       # 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=$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=$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();
+       
+       # 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.
+       system("valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10 $binpath/$executable -nofork -debug -nolog");
+}
+
+sub screenvaldebug
+{
+       # 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();
+       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 valgrind and 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 valgrind -v --tool=memcheck --leak-check=yes --db-attach=yes --num-callers=10 $binpath/$executable -nofork -debug -nolog");
+}
 
 sub stop {
         if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)\n"; return 0; }
@@ -196,3 +260,30 @@ sub getprocessid {
        close PIDFILE;
        return $pid;
 }
+
+sub checkvalgrind
+{
+       unless(`valgrind --version`)
+       {
+               print "Couldn't start valgrind: $!\n";
+               exit;
+       }
+}
+
+sub checkgdb
+{
+       unless(`gdb --version`)
+       {
+               print "Couldn't start gdb: $!\n";
+               exit;
+       }
+}
+
+sub checkscreen
+{
+       unless(`screen --version`)
+       {
+               print "Couldn't start screen: $!\n";
+               exit;
+       }
+}