X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmodules.pl;h=bbce57cf5211d6bb3de5bb634806bdabd8701cdf;hb=be2d83be3e0f1d9cbc64066530cbda5f8411a032;hp=6ab39e91e63f6a91f99afd9f17ec37b45fc0a5d0;hpb=704614e06f7a898b67d013827e479ef12ff6d449;p=infobot.git diff --git a/src/modules.pl b/src/modules.pl index 6ab39e9..bbce57c 100644 --- a/src/modules.pl +++ b/src/modules.pl @@ -5,7 +5,8 @@ # Created: 20000624 # -#use strict; +# use strict; # TODO + use vars qw($AUTOLOAD); ### @@ -21,46 +22,55 @@ if ($@) { ### MODULES. %myModules = ( + "babelfish" => "babel.pl", + "botmail" => "botmail.pl", "bzflag" => "BZFlag.pl", "countdown" => "Countdown.pl", "debian" => "Debian.pl", "debianExtra" => "DebianExtra.pl", "dict" => "Dict.pl", "dumpvars" => "DumpVars.pl", - "symdump" => "DumpVars2.pl", + "exchange" => "Exchange.pl", "factoids" => "Factoids.pl", - "freshmeat" => "Freshmeat.pl", - "kernel" => "Kernel.pl", + "httpdtype" => "HTTPDtype.pl", + "insult" => "insult.pl", "ircdcc" => "UserDCC.pl", - "perlMath" => "Math.pl", + "kernel" => "Kernel.pl", "news" => "News.pl", + "nickometer" => "nickometer.pl", + "perlMath" => "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/$_"; @@ -78,38 +88,23 @@ sub loadCoreModules { } sub loadDBModules { - my $f = "$bot_src_dir/modules.pl"; - $moduleAge{$f} = (stat $f)[9]; + my $f; + # TODO: use function to load module. - 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; } - &status("Loading 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]; - &showProc(" (DBI // mysql)"); - } elsif ($param{'DBType'} =~ /^pgsql$/i) { -# eval "use Pg"; - eval "use DBI"; - if ($@) { - &ERROR("libpgperl is not installed!"); - exit 1; - } - &status("Loading pgsql support."); - require "$bot_src_dir/db_pgsql.pl"; - &showProc(" (pgsql)"); - } elsif ($param{'DBType'} =~ /^dbm$/i) { - &status("Loading Berkeley DBM support."); - $f = "$bot_src_dir/db_dbm.pl"; - require $f; - $moduleAge{$f} = (stat $f)[9]; - &showProc(" $bot_src_dir/db_dbm.pl"); + + &showProc(" (DBI::" . $param{'DBType'} . ")"); } else { - &status("DB support DISABLED."); + &WARN("DB support DISABLED."); return; } } @@ -149,21 +144,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")); @@ -203,40 +200,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]; @@ -244,13 +245,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}); @@ -265,13 +266,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; } ### @@ -293,7 +296,7 @@ sub loadPerlModule { return 0; } else { $perlModulesLoaded{$_[0]} = 1; - &status("Module: Loaded $_[0] ..."); + &status("Loaded $_[0]"); &showProc(" ($_[0])"); return 1; } @@ -303,7 +306,7 @@ sub loadMyModule { my ($tmp) = @_; if (!defined $tmp) { &WARN("loadMyModule: module is NULL."); - return 0; + return 0; } my ($modulename, $modulebase); @@ -330,7 +333,7 @@ sub loadMyModule { &shutdown() if (defined $shm and defined $dbh); } else { # child. &DEBUG("b4 delfork 1"); - &delForked($modulebase); + &delForked($modulename); } exit 1; @@ -341,7 +344,7 @@ sub loadMyModule { &ERROR("cannot load my module: $modulebase"); if ($bot_pid != $$) { # child. &DEBUG("b4 delfork 2"); - &delForked($modulebase); + &delForked($modulename); exit 1; } @@ -349,7 +352,7 @@ sub loadMyModule { } else { $moduleAge{$modulefile} = (stat $modulefile)[9]; - &status("myModule: Loaded $modulebase ..."); + &status("Loaded $modulebase"); &showProc(" ($modulebase)"); return 1; } @@ -387,8 +390,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;