[Cpan-forum-commit] rev 133 - trunk/lib/CPAN

[svn at pti.co.il]

Author: gabor
Date: 2005-03-22 16:55:23 +0200 (Tue, 22 Mar 2005)
New Revision: 133

Modified:
   trunk/lib/CPAN/Forum.pm
Log:
separate the reading of log_level

Modified: trunk/lib/CPAN/Forum.pm
===================================================================
--- trunk/lib/CPAN/Forum.pm	2005-03-22 14:49:49 UTC (rev 132)
+++ trunk/lib/CPAN/Forum.pm	2005-03-22 14:55:23 UTC (rev 133)
@@ -528,15 +528,7 @@
 	
 	my $log = $self->param("ROOT") . "/db/messages.log";
 	$STATUS_FILE = $self->param("ROOT") . "/db/status";
-	my $log_level = 'critical'; 
-	if (open my $fh, $self->param("ROOT") . "/db/log_level") {
-		chomp (my $str = <$fh>);
-		if (Log::Dispatch->level_is_valid($str)) {
-			$log_level = $str;
-		} else {
-			warn "Invalid log level '$str'\n";
-		}
-	}
+	my $log_level = $self->_set_log_level();
 
 	$self->log_config(
 		LOG_DISPATCH_MODULES => [
@@ -574,6 +566,22 @@
 	$self->session_cookie();
 }
 
+sub _set_log_level {
+	my ($self) = @_;
+
+	if (open my $fh, $self->param("ROOT") . "/db/log_level") {
+		chomp (my $str = <$fh>);
+		$str =~ s/^\s*|\s*$//g;
+		if (Log::Dispatch->level_is_valid($str)) {
+			return $str;
+		} else {
+			warn "Invalid log level '$str'\n";
+		}
+	}
+	return 'critical'; 
+}
+
+
 sub config {
 	my ($self, $field) = @_;