X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=.inspircd.inc;h=71eb3a75430be6a377555347b0b40b59fdb855dc;hb=fd8932217922ea291f4102dffbfd66de4d5e9827;hp=6328bbd00def11e032ccfa11e9125eee43a2a515;hpb=191adfdc7f5da7be8505381af9f47c86e35f1f4b;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/.inspircd.inc b/.inspircd.inc
index 6328bbd00..71eb3a754 100644
--- a/.inspircd.inc
+++ b/.inspircd.inc
@@ -47,7 +47,7 @@ if ($arg eq "rehash") {
 	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";
@@ -169,11 +169,13 @@ sub stop {
         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";
@@ -184,6 +186,13 @@ sub stop {
 # 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)
@@ -208,7 +217,7 @@ sub getpidfile {
   $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
@@ -222,7 +231,8 @@ sub getpidfile {
   my $tmp = join("",@lines);
 
   # Does this file have a pid?
-  if (($tmp =~ /<pid file=\"(\S+)\">/i) && ($tmp !~ /^#/)) {
+  if (($tmp =~ /<pid file=\"(\S+)\">/i) && ($tmp !~ /^#/))
+  {
     # Set the PID file and return.
     $pidfile = $1;
     return;
@@ -231,7 +241,7 @@ sub getpidfile {
   # 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 (($tmp =~ s/\<include file=\"(.+?)\"\>//i) && ($tmp !~ /^#/))
     {
       # Decend into that file, and check for PIDs.. (that sounds like an STD ;/)
       getpidfile($1);