update Debian.pl for etch release

[infobot.git] / src / Shm.pl

diff --git a/src/Shm.pl b/src/Shm.pl
index 0c3116bedd9c065e7d13a071a08d586d3e00496e..cebe4dc59b2b8c9a7142c8b4a7761c4207ee5cfc 100644 (file)
--- a/src/Shm.pl
+++ b/src/Shm.pl
@@ -48,7 +48,7 @@ sub shmRead {
     return '' if (&IsParam("noSHM"));
 
     if (shmread($key,$retval,$position,$size)) {
-       &DEBUG("shmRead($key): $retval");
+       #&DEBUG("shmRead($key): $retval");
        return $retval;
     } else {
        &ERROR("shmRead: failed: $!");
@@ -82,7 +82,7 @@ sub shmWrite {
     my $read = &shmRead($key);
     $read =~ s/\0+//g;
     if ($read eq "") {
-       $str = sprintf("%s:%d:%d: ", $param{ircNick}, $bot_pid, time());
+       $str = sprintf("%s:%d:%d: ", $param{ircUser}, $bot_pid, time());
     } else {
        $str = $read ."||". $str;
     }
@@ -229,13 +229,14 @@ sub shmFlush {
     return if ($$ != $::bot_pid); # fork protection.
 
     if (@_) {
-       &ScheduleThis(5, "shmFlush");
+       &ScheduleThis(15, "shmFlush");
        return if ($_[0] eq "2");
     }
 
     my $time;
     my $shmmsg = &shmRead($shm);
-    $shmmsg =~ s/\0//g;         # remove padded \0's.
+    # remove padded \0's.
+    $shmmsg =~ s/\0//g;
     return if (length($shmmsg) == 0);
     if ($shmmsg =~ s/^(\S+):(\d+):(\d+): //) {
        my $n   = $1;