removed feedback addressing. Issue raised by Flugh

[infobot.git] / src / core.pl

diff --git a/src/core.pl b/src/core.pl
index b95f06f0c2170f2b8f7003cf8143e9eaaae5dbc7..42a1ca81e9d8e4e2136a73ba56c9751502fa5d60 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -10,7 +10,7 @@ use strict;
 # dynamic scalar. MUST BE REDUCED IN SIZE!!!
 ### TODO: reorder.
 use vars qw(
-       $answer $correction_plausible $loggingstatus $talkchannel
+       $answer $correction_plausible $talkchannel
        $statcount $memusage $user $memusageOld $bot_version $dbh
        $shm $host $msg $bot_misc_dir $bot_pid $bot_base_dir $noreply
        $bot_src_dir $conn $irc $learnok $nick $ident $no_syscall
@@ -70,6 +70,7 @@ sub doExit {
        &closeSHM($shm);
        &dumpallvars()  if (&IsParam("dumpvarsAtExit"));
        &closeLog();
+       &closeSQLDebug()        if (&IsParam("SQLDebug"));
     } else {                                   # child.
        &status("child caught SIG$sig (pid $$).");
     }
@@ -115,15 +116,22 @@ sub showProc {
        if (defined $memusageOld and &IsParam("DEBUG")) {
            # it's always going to be increase.
            my $delta = $memusage - $memusageOld;
-           if ($delta > 500) {
-               &status("MEM:$prefix increased by $delta kB. (total: $memusage kB)");
+           my $str;
+           if ($delta == 0) {
+               return;
+           } elsif ($delta > 500) {
+               $str = "MEM:$prefix increased by $delta kB. (total: $memusage kB)";
            } elsif ($delta > 0) {
-               &status("MEM:$prefix increased by $delta kB.");
-           } elsif ($delta < 0) {
+               $str = "MEM:$prefix increased by $delta kB";
+           } else {    # delta < 0.
                $delta = -$delta;
                # never knew RSS could decrease, probably Size can't?
-               &status("MEM:$prefix decreased by $delta kB. YES YES YES");
+               $str = "MEM:$prefix decreased by $delta kB. YES YES YES";
            }
+
+           &status($str);
+           &DCCBroadcast($str) if (&whatInterface() =~ /IRC/ &&
+               grep(/Irc.pl/, keys %moduleAge));
        }
        $memusageOld = $memusage;
     } else {
@@ -147,7 +155,8 @@ sub setup {
     &loadUsers($bot_misc_dir.          "/blootbot.users");
 
     $shm = &openSHM();
-    &openDB();
+    &openSQLDebug()    if (&IsParam("SQLDebug"));
+    &openDB($param{'DBName'}, $param{'SQLUser'}, $param{'SQLPass'});
 
     &status("Setup: ". &countKeys("factoids") ." factoids.");
 
@@ -155,6 +164,7 @@ sub setup {
 }
 
 sub setupConfig {
+    $param{'VERBOSITY'} = 1;
     &loadConfig($bot_misc_dir."/blootbot.config");
 
     foreach ("ircNick", "ircUser", "ircName", "DBType") {
@@ -205,7 +215,7 @@ sub restart {
 
        &shutdown();
        &loadConfig($bot_misc_dir."/blootbot.config");
-       &reloadModules() if (&IsParam("DEBUG"));
+       &reloadAllModules() if (&IsParam("DEBUG"));
        &setup();
 
        &status("End of $sig.");