- fixed dns lookup

[infobot.git] / src / core.pl

diff --git a/src/core.pl b/src/core.pl
index 48fe3cf1900502776ad4ebf5330a7523923d9ea1..36e8c76b66eca42a3d37072b62892305937abd22 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 $talkchannel
+       $answer $correction_plausible $talkchannel $bot_release
        $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
@@ -19,8 +19,9 @@ use vars qw(
        $flag_quit $msgType
        $utime_userfile $wtime_userfile $ucount_userfile
        $utime_chanfile $wtime_chanfile $ucount_chanfile
-       $pubsize $pubcount $pubtime $pubsleep
-       $msgsize $msgcount $msgtime $msgsleep
+       $pubsize $pubcount $pubtime
+       $msgsize $msgcount $msgtime
+       $notsize $notcount $nottime
 );
 
 # dynamic hash.
@@ -58,12 +59,21 @@ $ucount_chanfile = 0;
 ### more variables...
 $msgtime       = time();
 $msgsize       = 0;
-$msgcount      = $msgsleep     = 0;
+$msgcount      = 0;
 $pubtime       = 0;
 $pubsize       = 0;
-$pubcount      = $pubsleep     = 0;
+$pubcount      = 0;
+$nottime       = 0;
+$notsize       = 0;
+$notcount      = 0;
 ###
-$bot_version   = "blootbot cvs (20010214) -- $^O";
+if ( -d "CVS" ) {
+    use POSIX qw(strftime);
+    $bot_release       = strftime("cvs (%Y%m%d)", localtime( (stat("CVS"))[9] ) );
+} else {
+    $bot_release       = "1.0.10 (2001xxxx)";
+}
+$bot_version   = "blootbot $bot_release -- $^O";
 $noreply       = "NOREPLY";
 
 ##########
@@ -85,6 +95,7 @@ sub doExit {
        &status("parent caught SIG$sig (pid $$).") if (defined $sig);
 
        &status("--- Start of quit.");
+       $ident ||= "blootbot";  # lame hack.
 
        &closeDCC();
        &closePID();
@@ -257,21 +268,31 @@ sub IsChanConf {
 #  About: Retrieve value for 'param' value in current/default chan.
 # Return: scalar for success, undef for failure.
 sub getChanConf {
-    my($param,$chan)   = @_;
+    my($param,$c)      = @_;
 
     if (!defined $param) {
        &WARN("param == NULL.");
        return 0;
     }
 
-    $chan      ||= "_default";
-    my @c      = grep /^$chan$/i, keys %chanconf;
+    # this looks evil... 
+    if (0 and !defined $chan) {
+       &DEBUG("gCC: ok !chan... doing _default instead.");
+    }
+
+    $c         ||= $chan;
+    $c         ||= "_default";
+    my @c      = grep /^$c$/i, keys %chanconf;
 
-    if (@c and $c[0] ne $chan) {
-       &WARN("c ne chan ($c[0] ne $chan)");
+    if (@c) {
+       if (0 and $c[0] ne $c) {
+           &WARN("c ne chan ($c[0] ne $chan)");
+       }
+       return $chanconf{$c[0]}{$param};
     }
 
-    return $chanconf{$c[0]}{$param} || $chanconf{"_default"}{$param};
+#    &DEBUG("gCC: returning _default... ");
+    return $chanconf{"_default"}{$param};
 }
 
 sub showProc {
@@ -347,13 +368,21 @@ sub setup {
     $shm = &openSHM();
     &openSQLDebug()    if (&IsParam("SQLDebug"));
     &openDB($param{'DBName'}, $param{'SQLUser'}, $param{'SQLPass'});
+    &checkTables();
 
     &status("Setup: ". &countKeys("factoids") ." factoids.");
     &News::readNews() if (&ChanConfList("news"));
+    &getChanConfDefault("sendPrivateLimitLines", 3);
+    &getChanConfDefault("sendPrivateLimitBytes", 1000);
+    &getChanConfDefault("sendPublicLimitLines", 3);
+    &getChanConfDefault("sendPublicLimitBytes", 1000);
+    &getChanConfDefault("sendNoticeLimitLines", 3);
+    &getChanConfDefault("sendNoticeLimitBytes", 1000);
 
     $param{tempDir} =~ s#\~/#$ENV{HOME}/#;
 
     &status("Initial memory usage: $memusage kB");
+    &status("-------------------------------------------------------");
 }
 
 sub setupConfig {
@@ -400,7 +429,9 @@ sub startup {
 
 sub shutdown {
     # reverse order of &setup().
-    &DEBUG("shutdown called.");
+    &status("--- shutdown called.");
+
+    $ident ||= "blootbot";     # hack.
 
     # opened files must be written to on shutdown/hup/whatever
     # unless they're write-only, like uptime.