shm still not right

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@832 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/Schedulers.pl b/src/IRC/Schedulers.pl
index 5519373245efa79b2140a67dc4bd946f7e765490..cfc87ba7b43a3e97d4abfaa1a0dccd93f984fffc 100644 (file)
--- a/src/IRC/Schedulers.pl
+++ b/src/IRC/Schedulers.pl
@@ -773,8 +773,8 @@ sub miscCheck {
            # don't touch other bots, if they're running.
            next unless ($param{ircNick} =~ /^\Q$n\E$/);
        } else {
-#          &DEBUG("shm: $shmid is not ours or old blootbot => ($z)");
-#          next;
+           &DEBUG("shm: $shmid is not ours or old blootbot => ($z)");
+           next;
        }
 
        &status("SHM: nuking shmid $shmid");

diff --git a/src/Shm.pl b/src/Shm.pl
index 4b142a46526b15173301527f13a389259cc52d9b..0c3116bedd9c065e7d13a071a08d586d3e00496e 100644 (file)
--- a/src/Shm.pl
+++ b/src/Shm.pl
@@ -143,9 +143,9 @@ sub addForked {
        if ($count > 3) {       # 3 seconds.
            my $list = join(', ', keys %forked);
            if (defined $who) {
-               &msg($who, "exceeded allowed forked count: $list");
+               &msg($who, "exceeded allowed forked count (shm $shm): $list");
            } else {
-               &status("Fork: I ran too many forked processes :) Giving up $name.");
+               &status("Fork: I ran too many forked processes :) Giving up $name. Shm: $shm");
            }
 
            return 0;