diff options
Diffstat (limited to 'lib/MasterServer/Core')
| -rwxr-xr-x | lib/MasterServer/Core/Core.pm | 7 | ||||
| -rwxr-xr-x | lib/MasterServer/Core/Logging.pm | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/MasterServer/Core/Core.pm b/lib/MasterServer/Core/Core.pm index d49e36b..02ec32a 100755 --- a/lib/MasterServer/Core/Core.pm +++ b/lib/MasterServer/Core/Core.pm @@ -65,13 +65,13 @@ sub main { if ( "Pg SQLite" =~ m/$db_type[1]/i) { # inform us what DB we try to load - $self->log("loader","Loading $db_type[1] database module."); + $self->log("load","Loading $db_type[1] database module."); # load dbd and tables/queries for this db type MasterServer::load_recursive("MasterServer::Database::$db_type[1]"); # Connect to database - $self->{dbh} = $self->database_login(); #FIXME!!!! + $self->{dbh} = $self->database_login(); } else { # raise error and halt @@ -84,6 +84,9 @@ sub main { # start the listening service (listen for UDP beacons) $self->{scope}->{beacon_catcher} = $self->beacon_catcher(); + # start the beacon checker service (query entries from the pending list) + $self->{scope}->{beacon_checker} = $self->beacon_checker() if ($self->{beacon_checker_enabled}); + $self->log("info", "All modules loaded. Starting..."); diff --git a/lib/MasterServer/Core/Logging.pm b/lib/MasterServer/Core/Logging.pm index efd2123..312a0f8 100755 --- a/lib/MasterServer/Core/Logging.pm +++ b/lib/MasterServer/Core/Logging.pm @@ -25,10 +25,7 @@ sub log { my $daily = strftime('-%Y-%m-%d',localtime); # is the message suppressed in config? - if (defined $type && $self->{suppress} =~ m/$type/i){ - print "[$time] [SUPPRESSED] [$type] $msg\n"; #FIXME - return; # return if <$> - } + return if (defined $type && $self->{suppress} =~ m/$type/i); # determine filename my $f = "MasterServer-333networks"; |