X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmodules.pl;h=b81d31fef4d0428265cd7ae1fd3fa5511a95d337;hb=fd0e69fb63759b857342cbd41c0f27c84fbb8936;hp=62c8e1da1ae8b36a4ed33ff2ff9e34c3cabdacc2;hpb=9f6fa885f8438f3cf7b13387cd93bb2bee4640b5;p=infobot.git diff --git a/src/modules.pl b/src/modules.pl index 62c8e1d..b81d31f 100644 --- a/src/modules.pl +++ b/src/modules.pl @@ -5,9 +5,9 @@ # Created: 20000624 # -# use strict; # TODO +use strict; -use vars qw($AUTOLOAD); +use vars qw($AUTOLOAD $no_timehires $bot_version $bot_release); ### ### REQUIRED MODULES. @@ -20,47 +20,11 @@ if ($@) { } &showProc(" (IO::Socket)"); -### MODULES. -%myModules = ( - "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", - "kernel" => "Kernel.pl", - "perlMath" => "Math.pl", - "news" => "News.pl", - "plug" => "Plug.pl", - "quote" => "Quote.pl", - "rootwarn" => "RootWarn.pl", - "search" => "Search.pl", - "slashdot" => "Slashdot3.pl", - "topic" => "Topic.pl", - "units" => "Units.pl", - "uptime" => "Uptime.pl", - "ircdcc" => "UserDCC.pl", - "userinfo" => "UserInfo.pl", - "weather" => "Weather.pl", - "wwwsearch" => "W3Search.pl", - "whatis" => "WhatIs.pl", - "wingate" => "Wingate.pl", - "babelfish" => "babel.pl", - "insult" => "insult.pl", - "nickometer" => "nickometer.pl", - "zfi" => "zfi.pl", - "zippy" => "Zippy.pl", - "zsi" => "zsi.pl", - "botmail" => "botmail.pl", -); ### THIS IS NOT LOADED ON RELOAD :( my @myModulesLoadNow; my @myModulesReloadNot; BEGIN { - @myModulesLoadNow = ('topic', 'uptime', 'news', 'rootWarn', 'symdump', 'botmail'); + @myModulesLoadNow = ('Topic', 'Uptime', 'News', 'RootWarn', 'DumpVars2', 'botmail', 'OnJoin'); @myModulesReloadNot = ('IRC/Irc.pl','IRC/Schedulers.pl'); } @@ -80,15 +44,15 @@ sub loadCoreModules { } $moduleAge{$mod} = (stat $mod)[9]; - &showProc(" ($_)") if (&IsParam("DEBUG")); + &showProc(" ($_)") if (&IsParam('DEBUG')); } } sub loadDBModules { my $f; - # todo: use function to load module. + # TODO: use function to load module. - if ($param{'DBType'} =~ /^(mysql|SQLite|pgsql)$/i) { + if ($param{'DBType'} =~ /^(mysql|SQLite(2)?|pgsql)$/i) { eval "use DBI"; if ($@) { &ERROR("No support for DBI::" . $param{'DBType'} . ", exiting!"); @@ -107,7 +71,7 @@ sub loadDBModules { } sub loadFactoidsModules { - if (!&IsParam("factoids")) { + if (!&IsParam('factoids')) { &status("Factoid support DISABLED."); return; } @@ -124,7 +88,7 @@ sub loadFactoidsModules { } $moduleAge{$mod} = (stat $mod)[9]; - &showProc(" ($_)") if (&IsParam("DEBUG")); + &showProc(" ($_)") if (&IsParam('DEBUG')); } } @@ -151,16 +115,16 @@ sub loadIRCModules { # hrm... use another config option besides DEBUG to display # change in memory usage. - &status("Loading Modules \"$mod\"") if (!&IsParam("DEBUG")); + &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")); + &showProc(" ($_)") if (&IsParam('DEBUG')); } } @@ -176,19 +140,12 @@ sub loadMyModulesNow { next; } - if (!&IsParam($_) and !&IsChanConf($_) and !&getChanConfList($_)) { - if (exists $myModules{$_}) { - &status("myModule: $myModules{$_} or $_ (1) not loaded."); - } else { - &DEBUG("myModule: $_ (2) not loaded."); - } - + if (!&IsParam($_) and &IsChanConf($_) <= 0 and !&getChanConfList($_)) { + &DEBUG("loadMyModuleNow: $_ (2) not loaded."); next; } - # weird hack to get rootwarn to work. - # it may break on other cases though, any ideas? - &loadMyModule( $myModules{$_} || $myModules{lc $_} ); + &loadMyModule($_); $loaded++; } @@ -197,40 +154,51 @@ sub loadMyModulesNow { ### rename to moduleReloadAll? sub reloadAllModules { + my $retval = ''; + &VERB("Module: reloading all.",2); + + # Reload version and save + open(VERSION," || "(unknown version)"; + chomp($bot_release); + $bot_version = "infobot $bot_release -- $^O"; + close(VERSION); # 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]; @@ -238,13 +206,12 @@ 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; + &DEBUG("age => $age, mA{$file} => $moduleAge{$file}"); + return $retval; } my $dc = &Time2String($age - $moduleAge{$file}); @@ -259,13 +226,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; } ### @@ -294,32 +263,22 @@ sub loadPerlModule { } sub loadMyModule { - my ($tmp) = @_; - if (!defined $tmp) { + my ($modulename) = @_; + if (!defined $modulename) { &WARN("loadMyModule: module is NULL."); - return 0; + return 0; } - my ($modulename, $modulebase); - if (exists $myModules{$tmp}) { - ($modulename, $modulebase) = ($tmp, $myModules{$tmp}); - } else { - $modulebase = $tmp; - if ($tmp = grep /^$modulebase$/, keys %myModules) { - &DEBUG("lMM: lame hack, file => name => $tmp."); - $modulename = $tmp; - } - } - my $modulefile = "$bot_src_dir/Modules/$modulebase"; + my $modulefile = "$bot_src_dir/Modules/$modulename.pl"; # call reloadModule() which checks age of file and reload. - if (grep /\/$modulebase$/, keys %INC) { - &reloadModule($modulebase); + if (grep /\/$modulename$/, keys %INC) { + &reloadModule($modulename); return 1; # depend on reloadModule? } if (! -f $modulefile) { - &ERROR("lMM: module ($modulebase) does not exist."); + &ERROR("lMM: module ($modulename) does not exist."); if ($$ == $bot_pid) { # parent. &shutdown() if (defined $shm and defined $dbh); } else { # child. @@ -332,7 +291,7 @@ sub loadMyModule { eval "require \"$modulefile\""; if ($@) { - &ERROR("cannot load my module: $modulebase"); + &ERROR("cannot load my module: $modulename"); if ($bot_pid != $$) { # child. &DEBUG("b4 delfork 2"); &delForked($modulename); @@ -343,8 +302,8 @@ sub loadMyModule { } else { $moduleAge{$modulefile} = (stat $modulefile)[9]; - &status("Loaded $modulebase"); - &showProc(" ($modulebase)"); + &status("Loaded $modulename"); + &showProc(" ($modulename)"); return 1; } } @@ -370,19 +329,17 @@ sub AUTOLOAD { $AUTOLOAD =~ s/^(\S+):://g; - if (exists $myModules{lc $AUTOLOAD}) { - # hopefully this will work. - &DEBUG("Trying to load module $AUTOLOAD..."); - &loadMyModule(lc $AUTOLOAD); - } + # hopefully this will work. + &DEBUG("Trying to load module $AUTOLOAD..."); + &loadMyModule($AUTOLOAD); } 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;