svn commit: r805283 - /incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php

[gr...@apache.org]

Author: grobmeier
Date: Tue Aug 18 05:28:45 2009
New Revision: 805283

URL: http://svn.apache.org/viewvc?rev=805283&view=rev
Log:
cleaned up, formatting

Modified:
    incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php

Modified: incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php?rev=805283&r1=805282&r2=805283&view=diff
==============================================================================
--- incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php (original)
+++ incubator/log4php/trunk/src/main/php/configurators/LoggerConfiguratorIni.php Tue Aug 18 05:28:45 2009
@@ -88,20 +88,6 @@
 	 */
 	public function __construct() {
 	}
-	
-	/**
-	 * Configure the default repository using the resource pointed by <b>url</b>.
-	 * <b>Url</b> is any valid resurce as defined in {@link PHP_MANUAL#file} function.
-	 * Note that the resource will be search with <i>use_include_path</i> parameter 
-	 * set to "1".
-	 *
-	 * @param string $url
-	 * @return boolean configuration result
-	 * @static
-	 */
-	public function configure(LoggerHierarchy $hierarchy, $url = '') {
-		return $this->doConfigure($url, $hierarchy);
-	}
 
 	/**
 	 * Read configuration from a file.
@@ -298,16 +284,15 @@
 	 *					  configuration information is stored.
 	 * @param LoggerHierarchy $repository the repository to apply the configuration
 	 */
-	private function doConfigure($url, LoggerHierarchy $repository) {
+	public function configure(LoggerHierarchy $hierarchy, $url = '') {
 		$properties = @parse_ini_file($url);
 		if ($properties === false || count($properties) == 0) {
 			$error = error_get_last();
 		    throw new LoggerException("LoggerConfiguratorIni: ".$error['message']);
 		}
-		return $this->doConfigureProperties($properties, $repository);
+		return $this->doConfigureProperties($properties, $hierarchy);
 	}
 
-
 	/**
 	 * Read configuration options from <b>properties</b>.
 	 *
@@ -316,28 +301,13 @@
 	 * @param LoggerHierarchy $hierarchy
 	 */
 	private function doConfigureProperties($properties, LoggerHierarchy $hierarchy) {
-		/*
-		$value = @$properties[LOGGER_DEBUG_KEY];
-		
-		if(!empty($value)) {
-			LoggerLog::internalDebugging(LoggerOptionConverter::toBoolean($value, LoggerLog::internalDebugging()));
-		}
-		*/
-		
-		
 		$thresholdStr = @$properties[self::THRESHOLD_PREFIX];
 		$hierarchy->setThreshold(LoggerOptionConverter::toLevel($thresholdStr, LoggerLevel::getLevelAll()));
-		
 		$this->configureRootCategory($properties, $hierarchy);
 		$this->parseCatsAndRenderers($properties, $hierarchy);
-
 		return true;
 	}
 
-	// --------------------------------------------------------------------------
-	// Internal stuff
-	// --------------------------------------------------------------------------
-	
 	/**
 	 * @param array $props array of properties
 	 * @param LoggerHierarchy $hierarchy
@@ -352,21 +322,10 @@
 		}
 
 		if(empty($value)) {
-//			LoggerLog::debug(
-//				"LoggerPropertyConfigurator::configureRootCategory() ".
-//				"Could not find root logger information. Is this OK?"
-//			);
+			// TODO "Could not find root logger information. Is this OK?"
 		} else {
 			$root = $hierarchy->getRootLogger();
-			// synchronized(root) {
-				$this->parseCategory(
-				$props, 
-				$root, 
-				$effectivePrefix, 
-				self::INTERNAL_ROOT_NAME, 
-				$value
-			);
-			// }
+			$this->parseCategory($props, $root, $effectivePrefix, self::INTERNAL_ROOT_NAME,	$value);
 		}
 	}
 
@@ -387,10 +346,8 @@
 				}
 				
 				$logger = $hierarchy->getLogger($loggerName);
-					// synchronized(logger) {
-					$this->parseCategory($props, $logger, $key, $loggerName, $value);
-					$this->parseAdditivityForLogger($props, $logger, $loggerName);
-					// }
+				$this->parseCategory($props, $logger, $key, $loggerName, $value);
+				$this->parseAdditivityForLogger($props, $logger, $loggerName);
 			} else if(strpos($key, self::RENDERER_PREFIX) === 0) {
 				$renderedClass = substr($key, strlen(self::RENDERER_PREFIX));
 				$renderingClass = $value;
@@ -409,10 +366,7 @@
 	 * @param string $loggerName
 	 */
 	private function parseAdditivityForLogger($props, Logger $cat, $loggerName) {
-		$value = LoggerOptionConverter::findAndSubst(
-					self::ADDITIVITY_PREFIX . $loggerName,
-										$props
-				 );
+		$value = LoggerOptionConverter::findAndSubst(self::ADDITIVITY_PREFIX . $loggerName, $props);
 		
 		// touch additivity only if necessary
 		if(!empty($value)) {
@@ -432,7 +386,6 @@
 	 * @return Logger
 	 */
 	private function parseCategory($props, Logger $logger, $optionKey, $loggerName, $value) {
-		
 		// We must skip over ',' but not white space
 		$st = explode(',', $value);
 
@@ -451,11 +404,7 @@
 			// root category.
 			if('INHERITED' == strtoupper($levelStr) || 'NULL' == strtoupper($levelStr)) {
 				if($loggerName == self::INTERNAL_ROOT_NAME) {
-//					TODO: throw exception?
-//					LoggerLog::warn(
-//						"LoggerPropertyConfigurator::parseCategory() ".
-//						"The root logger cannot be set to null."
-//					);
+					// TODO: throw exception?	"The root logger cannot be set to null."
 				} else {
 					$logger->setLevel(null);
 				}
@@ -522,5 +471,4 @@
 		LoggerReflectionUtils::setPropertiesByObject($appender, $props, $prefix . ".");
 		return $appender;		 
 	}
-
 }