X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=src%2Fmodules.pl;h=bcbd3282a50665e8c1cfd1d80a21d5cc93b22557;hb=f3618054e8879cfcc83a1e0c1d3aceb83a092ed7;hp=6aea9e0e2175e88608b7af4d8a14f3ad3e031c93;hpb=1b18dcfaff9e5faa0ab252d0459509f843c0c435;p=infobot.git diff --git a/src/modules.pl b/src/modules.pl index 6aea9e0..bcbd328 100644 --- a/src/modules.pl +++ b/src/modules.pl @@ -5,8 +5,9 @@ # Created: 20000624 # -if (&IsParam("useStrict")) { use strict; } -use vars qw($AUTOLOAD); +use strict; + +use vars qw($AUTOLOAD $no_timehires); ### ### REQUIRED MODULES. @@ -19,54 +20,18 @@ if ($@) { } &showProc(" (IO::Socket)"); -### MODULES. -%myModules = ( - "countdown" => "Countdown.pl", - "debian" => "Debian.pl", - "debianExtra" => "DebianExtra.pl", - "dict" => "Dict.pl", - "dumpvars" => "DumpVars.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", - "search" => "Search.pl", - "slashdot" => "Slashdot3.pl", - "topic" => "Topic.pl", - "units" => "Units.pl", - "uptime" => "Uptime.pl", - "userinfo" => "UserInfo.pl", - "wwwsearch" => "W3Search.pl", - "whatis" => "WhatIs.pl", - "wingate" => "Wingate.pl", - "insult" => "insult.pl", - "nickometer" => "nickometer.pl", - "babelfish" => "babel.pl", -); ### THIS IS NOT LOADED ON RELOAD :( +my @myModulesLoadNow; +my @myModulesReloadNot; BEGIN { - @myModulesLoadNow = ('topic', 'uptime', 'news'); + @myModulesLoadNow = ('Topic', 'Uptime', 'News', 'RootWarn', 'DumpVars2', 'botmail', 'OnJoin'); @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); - my @mods; - while (defined(my $file = readdir DIR)) { - next unless $file =~ /\.pl$/; - next unless $file =~ /^[A-Z]/; - push(@mods, $file); - } - closedir DIR; - &status("Loading ".scalar(@mods)." CORE modules..."); + &status("Loading CORE modules..."); foreach (sort @mods) { my $mod = "$bot_src_dir/$_"; @@ -84,100 +49,83 @@ sub loadCoreModules { } sub loadDBModules { - &status("Loading DB modules..."); + my $f; + # TODO: use function to load module. - if ($param{'DBType'} =~ /^mysql$/i) { + if ($param{'DBType'} =~ /^(mysql|SQLite(2)?|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."); - require "$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"; - if ($@) { - &ERROR("libpgperl is not installed!"); - exit 1; - } - &showProc(" (Pg // postgreSQLl)"); - - &status(" using PostgreSQL support."); - require "$bot_src_dir/db_pgsql.pl"; - } elsif ($param{'DBType'} =~ /^dbm$/i) { - - &status(" using Berkeley DBM 1.85/2.0 support."); - require "$bot_src_dir/db_dbm.pl"; + &showProc(" (DBI::" . $param{'DBType'} . ")"); } else { - - &status("DB support DISABLED."); + &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 { @@ -192,17 +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; } - &loadMyModule($myModules{$_}); + &loadMyModule($_); $loaded++; } @@ -211,37 +154,44 @@ sub loadMyModulesNow { ### rename to moduleReloadAll? sub reloadAllModules { -### &status("Module: reloading all."); - foreach (map { substr($_,2) } keys %moduleAge) { - &reloadModule($_); + my $retval = ""; + + &VERB("Module: reloading all.",2); + + # obscure usage of map and regex :) + foreach (map { s/.*?\/?src/src/; $_ } keys %moduleAge) { + $retval .= &reloadModule($_); } -### &status("Module: reloading done."); + + &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; + &DEBUG("rM: should not reload $mod"); + return $retval; } my $age = (stat $file)[9]; @@ -249,11 +199,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 the file. use 'touch'."); - return; + &WARN("rM: we're not gonna downgrade '$file'; use touch."); + &DEBUG("age => $age, mA{$file} => $moduleAge{$file}"); + return $retval; } my $dc = &Time2String($age - $moduleAge{$file}); @@ -268,21 +219,23 @@ 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; } ### ### OPTIONAL MODULES. ### -local %perlModulesLoaded = (); -local %perlModulesMissing = (); +my %perlModulesLoaded = (); +my %perlModulesMissing = (); sub loadPerlModule { return 0 if (exists $perlModulesMissing{$_[0]}); @@ -296,44 +249,34 @@ sub loadPerlModule { return 0; } else { $perlModulesLoaded{$_[0]} = 1; - &status("Module: Loaded $_[0] ..."); + &status("Loaded $_[0]"); &showProc(" ($_[0])"); return 1; } } sub loadMyModule { - my ($tmp) = @_; - if (!defined $tmp) { + my ($modulename) = @_; + if (!defined $modulename) { &WARN("loadMyModule: module is NULL."); - return 0; + return 0; } - my ($modulebase, $modulefile); - 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. &DEBUG("b4 delfork 1"); - &delForked($modulebase); + &delForked($modulename); } exit 1; @@ -341,10 +284,10 @@ 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($modulebase); + &delForked($modulename); exit 1; } @@ -352,8 +295,8 @@ sub loadMyModule { } else { $moduleAge{$modulefile} = (stat $modulefile)[9]; - &status("myModule: Loaded $modulebase ..."); - &showProc(" ($modulebase)"); + &status("Loaded $modulename"); + &showProc(" ($modulename)"); return 1; } } @@ -367,18 +310,40 @@ 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. my $str = join(', ', @_); - &ERROR("UNKNOWN FUNCTION CALLED: $AUTOLOAD ($str)"); + 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); + # 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; } + + 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;