X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=blootbot%2Fsrc%2Fmodules.pl;h=9429dfd4b1a4a78eeae9afdf26cc24cc60fd0130;hb=ed1107a2aff6ddbc19e911af2cfdf002f47ac36f;hp=36e3204529c8cd8d14ce3116e52ff6acbd518b06;hpb=64f8401574d0ad71be9eef15224e6fb514483ccb;p=infobot.git diff --git a/blootbot/src/modules.pl b/blootbot/src/modules.pl index 36e3204..9429dfd 100644 --- a/blootbot/src/modules.pl +++ b/blootbot/src/modules.pl @@ -5,7 +5,8 @@ # Created: 20000624 # -#use strict; +# use strict; # TODO + use vars qw($AUTOLOAD); ### @@ -21,45 +22,56 @@ if ($@) { ### MODULES. %myModules = ( - "countdown" => "Countdown.pl", - "debian" => "Debian.pl", - "debianExtra" => "DebianExtra.pl", - "dict" => "Dict.pl", - "dumpvars" => "DumpVars.pl", - "symdump" => "DumpVars2.pl", - "factoids" => "Factoids.pl", - "freshmeat" => "Freshmeat.pl", - "kernel" => "Kernel.pl", - "ircdcc" => "UserDCC.pl", - "perlMath" => "Math.pl", - "news" => "News.pl", - "quote" => "Quote.pl", - "rootwarn" => "RootWarn.pl", + "babelfish" => "babelfish.pl", + "botmail" => "botmail.pl", + "BZFlag" => "BZFlag.pl", + "countdown" => "countdown.pl", + "Debian" => "Debian.pl", + "DebianExtra" => "DebianExtra.pl", + "Dict" => "Dict.pl", + "DumpVars" => "DumpVars.pl", + "Exchange" => "Exchange.pl", + "Factoids" => "Factoids.pl", + "HTTPDtype" => "HTTPDtype.pl", + "insult" => "insult.pl", + "UserDCC" => "UserDCC.pl", + "Kernel" => "Kernel.pl", + "News" => "News.pl", + "nickometer" => "nickometer.pl", + "pager" => "pager.pl", + "Math" => "Math.pl", + "Plug" => "Plug.pl", + "Quote" => "Quote.pl", + "RootWarn" => "RootWarn.pl", + "rss" => "Rss.pl", "search" => "Search.pl", "slashdot" => "Slashdot3.pl", + "symdump" => "DumpVars2.pl", "topic" => "Topic.pl", "units" => "Units.pl", "uptime" => "Uptime.pl", "userinfo" => "UserInfo.pl", - "wwwsearch" => "W3Search.pl", + "weather" => "Weather.pl", "whatis" => "WhatIs.pl", + "wikipedia" => "wikipedia.pl", "wingate" => "Wingate.pl", - "insult" => "insult.pl", - "nickometer" => "nickometer.pl", - "babelfish" => "babel.pl", + "wwwsearch" => "W3Search.pl", + "zfi" => "zfi.pl", + "zippy" => "Zippy.pl", + "zsi" => "zsi.pl", ); ### THIS IS NOT LOADED ON RELOAD :( my @myModulesLoadNow; my @myModulesReloadNot; BEGIN { - @myModulesLoadNow = ('topic', 'uptime', 'news', 'rootWarn', 'symdump'); + @myModulesLoadNow = ('topic', 'uptime', 'News', 'RootWarn', 'symdump', 'botmail'); @myModulesReloadNot = ('IRC/Irc.pl','IRC/Schedulers.pl'); } sub loadCoreModules { my @mods = &getPerlFiles($bot_src_dir); - &status("Loading ".scalar(@mods)." CORE modules..."); + &status("Loading CORE modules..."); foreach (sort @mods) { my $mod = "$bot_src_dir/$_"; @@ -77,43 +89,23 @@ sub loadCoreModules { } sub loadDBModules { - &status("Loading DB modules..."); + my $f; + # TODO: use function to load module. - my $f = "$bot_src_dir/modules.pl"; - $moduleAge{$f} = (stat $f)[9]; - - if ($param{'DBType'} =~ /^mysql$/i) { + if ($param{'DBType'} =~ /^(mysql|SQLite|pgsql)$/i) { eval "use DBI"; if ($@) { - &ERROR("libdbd-mysql-perl is not installed!"); + &ERROR("No support for DBI::" . $param{'DBType'} . ", exiting!"); exit 1; } - &showProc(" (DBI // mysql)"); - - &status(" using MySQL support."); - $f = "$bot_src_dir/db_mysql.pl"; + &status("Loading " . $param{'DBType'} . " support."); + $f = "$bot_src_dir/dbi.pl"; require $f; $moduleAge{$f} = (stat $f)[9]; - } elsif ($param{'DBType'} =~ /^pgsql$/i) { -# eval "use Pg"; - eval "use DBI"; - if ($@) { - &ERROR("libpgperl is not installed!"); - exit 1; - } - &showProc(" (pgsql)"); - - &status(" using pgsql support."); - require "$bot_src_dir/db_pgsql.pl"; - - } elsif ($param{'DBType'} =~ /^dbm$/i) { - - &status(" using Berkeley DBM support."); - require "$bot_src_dir/db_dbm.pl"; + &showProc(" (DBI::" . $param{'DBType'} . ")"); } else { - - &status("DB support DISABLED."); + &WARN("DB support DISABLED."); return; } } @@ -153,21 +145,23 @@ sub loadIRCModules { &showProc(" (Net::IRC)"); } else { &status("IRC support DISABLED."); - # disabling forking. - $param{forking} = 0; - $param{noSHM} = 1; + # disabling forking. Why? + #$param{forking} = 0; + #$param{noSHM} = 1; } foreach ( &getPerlFiles("$bot_src_dir/$interface") ) { my $mod = "$bot_src_dir/$interface/$_"; - &status("Loading Modules \"$mod\""); + # hrm... use another config option besides DEBUG to display + # change in memory usage. + &status("Loading Modules \"$mod\"") if (!&IsParam("DEBUG")); eval "require \"$mod\""; if ($@) { &ERROR("require \"$mod\" => $@"); &shutdown(); exit 1; - } + } $moduleAge{$mod} = (stat $mod)[9]; &showProc(" ($_)") if (&IsParam("DEBUG")); @@ -196,9 +190,7 @@ sub loadMyModulesNow { next; } - # weird hack to get rootwarn to work. - # it may break on other cases though, any ideas? - &loadMyModule( $myModules{$_} || $myModules{lc $_} ); + &loadMyModule($myModules{$_}); $loaded++; } @@ -207,40 +199,44 @@ sub loadMyModulesNow { ### rename to moduleReloadAll? sub reloadAllModules { + my $retval = ""; + &VERB("Module: reloading all.",2); # obscure usage of map and regex :) foreach (map { s/.*?\/?src/src/; $_ } keys %moduleAge) { - &reloadModule($_); + $retval .= &reloadModule($_); } &VERB("Module: reloading done.",2); + return $retval; } ### rename to modulesReload? sub reloadModule { my ($mod) = @_; my $file = (grep /\/$mod/, keys %INC)[0]; + my $retval = ""; # don't reload if it's not our module. if ($mod =~ /::/ or $mod !~ /pl$/) { &VERB("Not reloading $mod.",3); - return; + return $retval; } if (!defined $file) { &WARN("rM: Cannot reload $mod since it was not loaded anyway."); - return; + return $retval; } if (! -f $file) { &ERROR("rM: file '$file' does not exist?"); - return; + return $retval; } if (grep /$mod/, @myModulesReloadNot) { &DEBUG("rM: should not reload $mod"); - return; + return $retval; } my $age = (stat $file)[9]; @@ -248,13 +244,13 @@ sub reloadModule { if (!exists $moduleAge{$file}) { &DEBUG("Looks like $file was not loaded; fixing."); } else { - return if ($age == $moduleAge{$file}); + return $retval if ($age == $moduleAge{$file}); if ($age < $moduleAge{$file}) { &WARN("rM: we're not gonna downgrade '$file'; use touch."); &DEBUG("age => $age"); &DEBUG("mA{$file} => $moduleAge{$file}"); - return; + return $retval; } my $dc = &Time2String($age - $moduleAge{$file}); @@ -269,13 +265,15 @@ sub reloadModule { delete $INC{$file}; eval "require \"$file\""; # require or use? if (@$) { - &DEBUG("rM: failure: @$"); + &DEBUG("rM: failure: @$ "); } else { my $basename = $file; $basename =~ s/^.*\///; &status("Module: reloaded $basename"); + $retval = " $basename"; $moduleAge{$file} = $age; } + return $retval; } ### @@ -297,7 +295,7 @@ sub loadPerlModule { return 0; } else { $perlModulesLoaded{$_[0]} = 1; - &status("Module: Loaded $_[0] ..."); + &status("Loaded $_[0]"); &showProc(" ($_[0])"); return 1; } @@ -307,7 +305,7 @@ sub loadMyModule { my ($tmp) = @_; if (!defined $tmp) { &WARN("loadMyModule: module is NULL."); - return 0; + return 0; } my ($modulename, $modulebase); @@ -334,7 +332,7 @@ sub loadMyModule { &shutdown() if (defined $shm and defined $dbh); } else { # child. &DEBUG("b4 delfork 1"); - &delForked($modulebase); + &delForked($modulename); } exit 1; @@ -345,7 +343,7 @@ sub loadMyModule { &ERROR("cannot load my module: $modulebase"); if ($bot_pid != $$) { # child. &DEBUG("b4 delfork 2"); - &delForked($modulebase); + &delForked($modulename); exit 1; } @@ -353,7 +351,7 @@ sub loadMyModule { } else { $moduleAge{$modulefile} = (stat $modulefile)[9]; - &status("myModule: Loaded $modulebase ..."); + &status("Loaded $modulebase"); &showProc(" ($modulebase)"); return 1; } @@ -391,8 +389,8 @@ sub getPerlFiles { my($dir) = @_; if (!opendir(DIR, $dir)) { - &ERROR("Cannot open source directory ($dir): $!"); - exit 1; + &ERROR("Cannot open source directory ($dir): $!"); + exit 1; } my @mods;