# Created: 20000624
#
-#use strict;
+# use strict; # TODO
+
use vars qw($AUTOLOAD);
###
### 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",
"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",
+ "httpdtype" => "HTTPDtype.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/$_";
}
sub loadDBModules {
- &status("Loading DB modules...");
-
- 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;
}
- &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 1.85/2.0 support.");
- &ERROR("dbm support is broken... if you want it, fix it yourself!");
- &shutdown();
- exit 1;
-
-# require "$bot_src_dir/db_dbm.pl";
+ &showProc(" (DBI::" . $param{'DBType'} . ")");
} else {
-
- &status("DB support DISABLED.");
+ &WARN("DB support DISABLED.");
return;
}
}
}
sub loadIRCModules {
- if (&whatInterface() =~ /IRC/) {
+ my ($interface) = &whatInterface();
+ if ($interface =~ /IRC/) {
&status("Loading IRC modules...");
eval "use Net::IRC";
exit 1;
}
&showProc(" (Net::IRC)");
-
} else {
&status("IRC support DISABLED.");
- return;
+ # disabling forking. Why?
+ #$param{forking} = 0;
+ #$param{noSHM} = 1;
}
- foreach ( &getPerlFiles("$bot_src_dir/IRC") ) {
- my $mod = "$bot_src_dir/IRC/$_";
+ 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("lIRCM => $@");
+ &ERROR("require \"$mod\" => $@");
&shutdown();
exit 1;
- }
+ }
$moduleAge{$mod} = (stat $mod)[9];
&showProc(" ($_)") if (&IsParam("DEBUG"));
### 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];
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});
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;
}
###
return 0;
} else {
$perlModulesLoaded{$_[0]} = 1;
- &status("Module: Loaded $_[0] ...");
+ &status("Loaded $_[0]");
&showProc(" ($_[0])");
return 1;
}
my ($tmp) = @_;
if (!defined $tmp) {
&WARN("loadMyModule: module is NULL.");
- return 0;
+ return 0;
}
my ($modulename, $modulebase);
&shutdown() if (defined $shm and defined $dbh);
} else { # child.
&DEBUG("b4 delfork 1");
- &delForked($modulebase);
+ &delForked($modulename);
}
exit 1;
&ERROR("cannot load my module: $modulebase");
if ($bot_pid != $$) { # child.
&DEBUG("b4 delfork 2");
- &delForked($modulebase);
+ &delForked($modulename);
exit 1;
}
} else {
$moduleAge{$modulefile} = (stat $modulefile)[9];
- &status("myModule: Loaded $modulebase ...");
+ &status("Loaded $modulebase");
&showProc(" ($modulebase)");
return 1;
}
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;
my($dir) = @_;
if (!opendir(DIR, $dir)) {
- &ERROR("Cannot open source directory ($dir): $!");
- exit 1;
+ &ERROR("Cannot open source directory ($dir): $!");
+ exit 1;
}
my @mods;
projects / infobot.git / blobdiff