Changeset 10627 for trunk/Nebulous-Server/lib/Nebulous/Server

Timestamp:

Dec 11, 2006, 2:02:53 PM (20 years ago)

Author:

jhoblitt

Message:

make Nebulous::Server::Log mod_perl aware
change Nebulous::Server::Log to accept a Nebulous::Server::Config object as a parameter instead of fetching it as a singleton

File:

• trunk/Nebulous-Server/lib/Nebulous/Server/Log.pm (modified) (4 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server/Log.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Log.pm,v 1.5 2005-08-26 02:06:33 jhoblitt Exp $
+# $Id: Log.pm,v 1.6 2006-12-12 00:02:53 jhoblitt Exp $
 
 package Nebulous::Server::Log;
@@ -8 +8 @@
 use warnings FATAL => qw( all );
 
-our $VERSION = '0.01';
+our $VERSION = '0.02';
 
 use Log::Log4perl;
@@ -14 +14 @@
 
 sub init {
-    # test for an extern config file here
-    my $config = Nebulous::Server::Config->instance;
+    my ($self, $config) = @_;
 
     my $dsn         = $config->dsn;
@@ -50 +49 @@
 END
 
-    Log::Log4perl::init( \$conf );
+    if ($INC{'Apache/DBI.pm'} && $ENV{MOD_PERL}) {
+        Log::Log4perl::init_once( \$conf );
+    } else {
+        Log::Log4perl::init( \$conf );
+    }
+
+    return 1;
 }