X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmodules.pl;h=5a8a20980200687fe7349d4ae162efb57c419270;hb=578f3a7303ac6ad9a63a70f8e370dfc1d06bf2b8;hp=fa93df42615dd28399939e60e244f6ccc12f8eb6;hpb=6b0fd4c9d52efdaf7c7e4e4396b5812b57177dcc;p=infobot.git diff --git a/src/modules.pl b/src/modules.pl index fa93df4..5a8a209 100644 --- a/src/modules.pl +++ b/src/modules.pl @@ -5,7 +5,8 @@ # Created: 20000624 # -if (&IsParam("useStrict")) { use strict; } +# use strict; # TODO + use vars qw($AUTOLOAD); ### @@ -21,16 +22,20 @@ if ($@) { ### 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", "freshmeat" => "Freshmeat.pl", "kernel" => "Kernel.pl", - "ircdcc" => "UserDCC.pl", "perlMath" => "Math.pl", + "news" => "News.pl", + "plug" => "Plug.pl", "quote" => "Quote.pl", "rootwarn" => "RootWarn.pl", "search" => "Search.pl", @@ -38,33 +43,36 @@ if ($@) { "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", - "babelfish" => "babel.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',); + @myModulesLoadNow = ('topic', 'uptime', 'news', 'rootWarn', 'symdump', 'botmail'); @myModulesReloadNot = ('IRC/Irc.pl','IRC/Schedulers.pl'); } sub loadCoreModules { - if (!opendir(DIR, $bot_src_dir)) { - &ERROR("can't open source directory $bot_src_dir: $!"); - exit 1; - } + my @mods = &getPerlFiles($bot_src_dir); &status("Loading CORE modules..."); - while (defined(my $file = readdir DIR)) { - next unless $file =~ /\.pl$/; - next unless $file =~ /^[A-Z]/; - my $mod = "$bot_src_dir/$file"; + foreach (sort @mods) { + my $mod = "$bot_src_dir/$_"; - ### TODO: use eval and exit gracefully? eval "require \"$mod\""; if ($@) { &ERROR("lCM => $@"); @@ -73,13 +81,13 @@ sub loadCoreModules { } $moduleAge{$mod} = (stat $mod)[9]; - &showProc(" ($file)") if (&IsParam("DEBUG")); + &showProc(" ($_)") if (&IsParam("DEBUG")); } - closedir DIR; } sub loadDBModules { - &status("Loading DB modules..."); + my $f; + # todo: use function to load module. if ($param{'DBType'} =~ /^mysql$/i) { eval "use DBI"; @@ -87,92 +95,109 @@ sub loadDBModules { &ERROR("libdbd-mysql-perl is not installed!"); exit 1; } - &showProc(" (DBI // mysql)"); + &status("Loading MySQL support."); + $f = "$bot_src_dir/dbi.pl"; + require $f; + $moduleAge{$f} = (stat $f)[9]; - &status(" using MySQL support."); - require "$bot_src_dir/db_mysql.pl"; + &showProc(" (DBI::mysql)"); } elsif ($param{'DBType'} =~ /^pgsql$/i) { - eval "use Pg"; + eval "use DBI"; if ($@) { &ERROR("libpgperl is not installed!"); exit 1; } - &showProc(" (Pg // postgreSQLl)"); + &status("Loading pgsql support."); + $f = "$bot_src_dir/dbi.pl"; + require $f; + $moduleAge{$f} = (stat $f)[9]; + + &showProc(" (DBI::pgsql)"); + + } elsif ($param{'DBType'} =~ /^sqlite$/i) { + eval "use DBI"; + if ($@) { + &ERROR("libdbd-sqlite-perl is not installed!"); + exit 1; + } + &status("Loading SQLite support."); + $f = "$bot_src_dir/dbi.pl"; + require $f; + $moduleAge{$f} = (stat $f)[9]; + + &showProc(" (DBI::SQLite)"); - &status(" using PostgreSQL support."); - require "$bot_src_dir/db_pgsql.pl"; } elsif ($param{'DBType'} =~ /^dbm$/i) { + &status("Loading dbm support."); + $f = "$bot_src_dir/dbm.pl"; + require $f; + $moduleAge{$f} = (stat $f)[9]; - &status(" using Berkeley DBM 1.85/2.0 support."); - require "$bot_src_dir/db_dbm.pl"; - } else { + &showProc(" (dbm.pl)"); - &status("DB support DISABLED."); + } else { + &WARN("DB support DISABLED."); return; } } sub loadFactoidsModules { - &status("Loading Factoids modules..."); - if (!&IsParam("factoids")) { &status("Factoid support DISABLED."); return; } - if (!opendir(DIR, "$bot_src_dir/Factoids")) { - &ERROR("can't open source directory Factoids: $!"); - exit 1; - } + &status("Loading Factoids modules..."); + + foreach ( &getPerlFiles("$bot_src_dir/Factoids") ) { + my $mod = "$bot_src_dir/Factoids/$_"; - while (defined(my $file = readdir DIR)) { - next unless $file =~ /\.pl$/; - next unless $file =~ /^[A-Z]/; - my $mod = "$bot_src_dir/Factoids/$file"; - ### TODO: use eval and exit gracefully? eval "require \"$mod\""; if ($@) { - &WARN("lFM: $@"); + &ERROR("lFM: $@"); exit 1; } $moduleAge{$mod} = (stat $mod)[9]; - &showProc(" ($file)") if (&IsParam("DEBUG")); + &showProc(" ($_)") if (&IsParam("DEBUG")); } - closedir DIR; } sub loadIRCModules { - &status("Loading IRC modules..."); - if (&whatInterface() =~ /IRC/) { + my ($interface) = &whatInterface(); + if ($interface =~ /IRC/) { + &status("Loading IRC modules..."); + eval "use Net::IRC"; if ($@) { &ERROR("libnet-irc-perl is not installed!"); exit 1; } &showProc(" (Net::IRC)"); - } else { &status("IRC support DISABLED."); - return; + # disabling forking. Why? + #$param{forking} = 0; + #$param{noSHM} = 1; } - if (!opendir(DIR, "$bot_src_dir/IRC")) { - &ERROR("can't open source directory Factoids: $!"); - exit 1; - } + foreach ( &getPerlFiles("$bot_src_dir/$interface") ) { + my $mod = "$bot_src_dir/$interface/$_"; + + # 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; + } - while (defined(my $file = readdir DIR)) { - next unless $file =~ /\.pl$/; - next unless $file =~ /^[A-Z]/; - my $mod = "$bot_src_dir/IRC/$file"; - ### TODO: use eval and exit gracefully? - require $mod; $moduleAge{$mod} = (stat $mod)[9]; - &showProc(" ($file)") if (&IsParam("DEBUG")); + &showProc(" ($_)") if (&IsParam("DEBUG")); } - closedir DIR; } sub loadMyModulesNow { @@ -187,9 +212,9 @@ sub loadMyModulesNow { next; } - if (!&IsParam($_) and !&IsChanConf($_)) { + if (!&IsParam($_) and !&IsChanConf($_) and !&getChanConfList($_)) { if (exists $myModules{$_}) { - &status("myModule: $myModules{$_} (1) not loaded."); + &status("myModule: $myModules{$_} or $_ (1) not loaded."); } else { &DEBUG("myModule: $_ (2) not loaded."); } @@ -197,20 +222,25 @@ sub loadMyModulesNow { next; } - &loadMyModule($myModules{$_}); + # weird hack to get rootwarn to work. + # it may break on other cases though, any ideas? + &loadMyModule( $myModules{$_} || $myModules{lc $_} ); $loaded++; } - &status("Module: Loaded/Total [$loaded/$total]"); + &status("Module: Runtime: Loaded/Total [$loaded/$total]"); } ### rename to moduleReloadAll? sub reloadAllModules { -### &status("Module: reloading all."); - foreach (map { substr($_,2) } keys %moduleAge) { + &VERB("Module: reloading all.",2); + + # obscure usage of map and regex :) + foreach (map { s/.*?\/?src/src/; $_ } keys %moduleAge) { &reloadModule($_); } -### &status("Module: reloading done."); + + &VERB("Module: reloading done.",2); } ### rename to modulesReload? @@ -234,25 +264,33 @@ sub reloadModule { return; } - my $age = (stat $file)[9]; - return if ($age == $moduleAge{$file}); - - if ($age < $moduleAge{$file}) { - &WARN("rM: we're not gonna downgrade the file. use 'touch'."); - return; - } - if (grep /$mod/, @myModulesReloadNot) { - &DEBUG("rM: SHOULD NOT RELOAD $mod!!!"); + &DEBUG("rM: should not reload $mod"); return; } - my $dc = &Time2String($age - $moduleAge{$file}); - my $ago = &Time2String(time() - $moduleAge{$file}); + my $age = (stat $file)[9]; + + if (!exists $moduleAge{$file}) { + &DEBUG("Looks like $file was not loaded; fixing."); + } else { + return 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; + } + + my $dc = &Time2String($age - $moduleAge{$file}); + my $ago = &Time2String(time() - $moduleAge{$file}); + + &VERB("Module: delta change: $dc",2); + &VERB("Module: ago: $ago",2); + } &status("Module: Loading $mod..."); - &VERB("Module: delta change: $dc",2); - &VERB("Module: ago: $ago",2); delete $INC{$file}; eval "require \"$file\""; # require or use? @@ -270,8 +308,8 @@ sub reloadModule { ### OPTIONAL MODULES. ### -local %perlModulesLoaded = (); -local %perlModulesMissing = (); +my %perlModulesLoaded = (); +my %perlModulesMissing = (); sub loadPerlModule { return 0 if (exists $perlModulesMissing{$_[0]}); @@ -298,7 +336,7 @@ sub loadMyModule { return 0; } - my ($modulebase, $modulefile); + my ($modulename, $modulebase); if (exists $myModules{$tmp}) { ($modulename, $modulebase) = ($tmp, $myModules{$tmp}); } else { @@ -322,7 +360,7 @@ sub loadMyModule { &shutdown() if (defined $shm and defined $dbh); } else { # child. &DEBUG("b4 delfork 1"); - &delForked($modulebase); + &delForked($modulename); } exit 1; @@ -333,7 +371,7 @@ sub loadMyModule { &ERROR("cannot load my module: $modulebase"); if ($bot_pid != $$) { # child. &DEBUG("b4 delfork 2"); - &delForked($modulebase); + &delForked($modulename); exit 1; } @@ -356,13 +394,42 @@ if ($@) { &showProc(" (Time::HiRes)"); sub AUTOLOAD { + if (!defined $AUTOLOAD and defined $::AUTOLOAD) { + &DEBUG("AUTOLOAD: hrm.. ::AUTOLOAD defined!"); + } + return unless (defined $AUTOLOAD); return if ($AUTOLOAD =~ /__/); # internal. - &ERROR("UNKNOWN FUNCTION CALLED: $AUTOLOAD"); - foreach (@_) { - next unless (defined $_); - &status(" => $_"); + my $str = join(', ', @_); + my ($package, $filename, $line) = caller; + &ERROR("UNKNOWN FUNCTION CALLED: $AUTOLOAD ($str) $filename line $line"); + + $AUTOLOAD =~ s/^(\S+):://g; + + if (exists $myModules{lc $AUTOLOAD}) { + # hopefully this will work. + &DEBUG("Trying to load module $AUTOLOAD..."); + &loadMyModule(lc $AUTOLOAD); + } +} + +sub getPerlFiles { + my($dir) = @_; + + if (!opendir(DIR, $dir)) { + &ERROR("Cannot open source directory ($dir): $!"); + exit 1; } + + my @mods; + while (defined(my $file = readdir DIR)) { + next unless $file =~ /\.pl$/; + next unless $file =~ /^[A-Z]/; + push(@mods, $file); + } + closedir DIR; + + return reverse sort @mods; } 1;