Added LD_LIBRARY_PATH hacks/kludges to the .inspircd.inc file to make it find libmysq...

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

diff --git a/.inspircd.inc b/.inspircd.inc
index a3032f6764b075b5f88253dd39e4d690c4517ab1..e90bb387472a06c219ecb4b3eff380cab7f9de6f 100644 (file)
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -15,6 +15,8 @@
 #               I HATE PERL.. kthxbye
 # ---------------------------------------------------
 
+$ENV{"LD_LIBRARY_PATH"} = $ENV{"LD_LIBRARY_PATH"} . ":/usr/local/lib/mysql:/usr/lib/mysql";
+
 my $conffile = "@CONFIG_DIR@/inspircd.conf";
 my $binpath = "@BINARY_DIR@/inspircd";
 
@@ -47,7 +49,8 @@ if ($arg eq "rehash") {
 }
 
 if ($arg eq "cron") {
-       if (getstatus() == 0) { start(); exit(); }
+       if (getstatus() == 0) { start(); }
+       exit();
 }
 
 if ($arg eq "restart") {
@@ -93,7 +96,14 @@ sub stop {
         if (getstatus() == 0) { print "InspIRCd is not running. (Or PID File not found)"; return 0; }
         # Get to here, we have something to kill.
         my $pid = getprocessid();
+       print "Stopping InspIRCd...\n";
         system("kill -TERM $pid >/dev/null 2>&1");
+       sleep 2;
+       if (getstatus() == 1)
+       {
+               print "InspIRCd not dying Quietly -- Forcing Kill\n";
+               system("kill -9 $pid >/dev/null 2>&1");
+       }
         print "InspIRCd Stopped.\n";
 }
 
@@ -125,7 +135,7 @@ sub getstatus {
 
 sub getprocessid {
        my $pid;
-       open PIDFILE, "< $pidfile" or die "Cannot open PID";
+       open PIDFILE, "< $pidfile" or return 0;
        while($i = <PIDFILE>)
        {
                $pid = $i;