If this method returns true, meaning that layout is required, + * then the configurator will configure a layout using the configuration + * information at its disposal. If this method returns false, + * meaning that a layout is not required, then layout configuration will be + * skipped even if there is available layout configuration + * information at the disposal of the configurator.
+ * + *In the rather exceptional case, where the appender + * implementation admits a layout but can also work without it, then + * the appender should return true.
+ * + * @see LoggerAppender::requiresLayout() + * @return boolean + */ + public function requiresLayout() { + return $this->requiresLayout; + } + + /** + * Get the name of this appender. + * @see LoggerAppender::getName() + * @return string + */ + public function getName() { + return $this->name; + } + +/** + * Set the name of this appender. + * + * The name is used by other components to identify this appender. + * + * + * @param string $name + */ + public function setName($name) { + $this->name = $name; + } + + /** + * Returns this appenders threshold level. + * See the {@link setThreshold()} method for the meaning of this option. + * @return LoggerLevel + */ + public function getThreshold() { + return $this->threshold; + } + + /** + * Set the threshold level of this appender. + * + * @param mixed $threshold can be a {@link LoggerLevel} object or a string. + * @see LoggerOptionConverter::toLevel() + */ + public function setThreshold($threshold) { + if(is_string($threshold)) { + $this->threshold = LoggerOptionConverter::toLevel($threshold, null); + } else if($threshold instanceof LoggerLevel) { + $this->threshold = $threshold; + } + } + + /** + * Check whether the message level is below the appender's threshold. + * + * + * If there is no threshold set, then the return value is always true. + * @param LoggerLevel $priority + * @return boolean true if priority is greater or equal than threshold + */ + public function isAsSevereAsThreshold($priority) { + if($this->threshold === null) { + return true; + } + return $priority->isGreaterOrEqual($this->getThreshold()); + } - /** - * Set the name of this appender. - * - * The name is used by other components to identify this appender. - * - * @param string $name - */ - abstract public function setName($name); + /** + * Derived appenders should override this method if option structure + * requires it. + */ + abstract public function activateOptions(); + + /** + * Subclasses of {@link LoggerAppender} should implement + * this method to perform actual logging. + * + * @param LoggerLoggingEvent $event + * @see doAppend() + * @abstract + */ + abstract protected function append($event); - /** - * Configurators call this method to determine if the appender - * requires a layout. - * - *If this method returns true, meaning that layout is required, - * then the configurator will configure a layout using the configuration - * information at its disposal. If this method returns false, - * meaning that a layout is not required, then layout configuration will be - * skipped even if there is available layout configuration - * information at the disposal of the configurator.
- * - *In the rather exceptional case, where the appender - * implementation admits a layout but can also work without it, then - * the appender should return true.
- * - * @return boolean - */ - abstract public function requiresLayout(); + /** + * Release any resources allocated. + * Subclasses of {@link LoggerAppender} should implement + * this method to perform proper closing procedures. + * @abstract + */ + abstract public function close(); + /** + * Finalize this appender by calling the derived class' close() method. + */ + public function finalize() { + // An appender might be closed then garbage collected. There is no + // point in closing twice. + if($this->closed) { + return; + } + $this->close(); + } + + /** + * Perform actions before object serialization. + * + * Call {@link finalize()} to properly close the appender. + */ + function __sleep() { + $this->finalize(); + return array_keys(get_object_vars($this)); + } + + public function __destruct() { + $this->finalize(); + } + +/** + * Perform actions after object de-serialization. + * + * Call {@link activateOptions()} to properly setup the appender. + */ + function __wakeup() { + $this->activateOptions(); + } } diff --git a/thirdparty/apache-log4php/src/main/php/LoggerAppenderSkeleton.php b/thirdparty/apache-log4php/src/main/php/LoggerAppenderSkeleton.php deleted file mode 100644 index 2a14371..0000000 --- a/thirdparty/apache-log4php/src/main/php/LoggerAppenderSkeleton.php +++ /dev/null @@ -1,337 +0,0 @@ -name = $name; - $this->clearFilters(); - } - - /** - * @param LoggerFilter $newFilter add a new LoggerFilter - * @see LoggerAppender::addFilter() - */ - public function addFilter($newFilter) { - if($this->headFilter === null) { - $this->headFilter = $newFilter; - $this->tailFilter = $this->headFilter; - } else { - $this->tailFilter->next = $newFilter; - $this->tailFilter = $this->tailFilter->next; - } - } - - /** - * Derived appenders should override this method if option structure - * requires it. - */ - abstract public function activateOptions(); - - /** - * Subclasses of {@link LoggerAppenderSkeleton} should implement - * this method to perform actual logging. - * - * @param LoggerLoggingEvent $event - * @see doAppend() - * @abstract - */ - abstract protected function append($event); - - /** - * @see LoggerAppender::clearFilters() - */ - public function clearFilters() - { - unset($this->headFilter); - unset($this->tailFilter); - $this->headFilter = null; - $this->tailFilter = null; - } - - /** - * Finalize this appender by calling the derived class' close() method. - */ - public function finalize() - { - // An appender might be closed then garbage collected. There is no - // point in closing twice. - if ($this->closed) return; - - LoggerLog::debug("LoggerAppenderSkeleton::finalize():name=[{$this->name}]."); - - $this->close(); - } - - /** - * Do not use this method. - * @see LoggerAppender::getErrorHandler() - * @return object - */ - public function getErrorHandler() - { - return $this->errorHandler; - } - - /** - * @see LoggerAppender::getFilter() - * @return LoggerFilter - */ - public function getFilter() - { - return $this->headFilter; - } - - /** - * Return the first filter in the filter chain for this Appender. - * The return value may be null if no is filter is set. - * @return LoggerFilter - */ - public function getFirstFilter() - { - return $this->headFilter; - } - - /** - * @see LoggerAppender::getLayout() - * @return LoggerLayout - */ - public function getLayout() - { - return $this->layout; - } - - /** - * @see LoggerAppender::getName() - * @return string - */ - public function getName() - { - return $this->name; - } - - /** - * Returns this appenders threshold level. - * See the {@link setThreshold()} method for the meaning of this option. - * @return LoggerLevel - */ - public function getThreshold() - { - return $this->threshold; - } - - /** - * Check whether the message level is below the appender's threshold. - * - * - * If there is no threshold set, then the return value is always true. - * @param LoggerLevel $priority - * @return boolean true if priority is greater or equal than threshold - */ - public function isAsSevereAsThreshold($priority) - { - if ($this->threshold === null) - return true; - - return $priority->isGreaterOrEqual($this->getThreshold()); - } - - /** - * @see LoggerAppender::doAppend() - * @param LoggerLoggingEvent $event - */ - public function doAppend($event) - { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend()"); - - if ($this->closed) { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend() Attempted to append to closed appender named [{$this->name}]."); - return; - } - if(!$this->isAsSevereAsThreshold($event->getLevel())) { - LoggerLog::debug("LoggerAppenderSkeleton::doAppend() event level is less severe than threshold."); - return; - } - - $f = $this->getFirstFilter(); - - while($f !== null) { - switch ($f->decide($event)) { - case LOG4PHP_LOGGER_FILTER_DENY: return; - case LOG4PHP_LOGGER_FILTER_ACCEPT: return $this->append($event); - case LOG4PHP_LOGGER_FILTER_NEUTRAL: $f = $f->getNext(); - } - } - $this->append($event); - } - - - /** - * @see LoggerAppender::requiresLayout() - * @return boolean - */ - public function requiresLayout() - { - return $this->requiresLayout; - } - - /** - * @see LoggerAppender::setErrorHandler() - * @param object - */ - public function setErrorHandler($errorHandler) - { - if($errorHandler == null) { - // We do not throw exception here since the cause is probably a - // bad config file. - LoggerLog::warn("You have tried to set a null error-handler."); - } else { - $this->errorHandler = $errorHandler; - } - } - - /** - * @see LoggerAppender::setLayout() - * @param LoggerLayout $layout - */ - public function setLayout($layout) - { - if ($this->requiresLayout()) - $this->layout = $layout; - } - - /** - * @see LoggerAppender::setName() - * @param string $name - */ - public function setName($name) - { - $this->name = $name; - } - - /** - * Set the threshold level of this appender. - * - * @param mixed $threshold can be a {@link LoggerLevel} object or a string. - * @see LoggerOptionConverter::toLevel() - */ - public function setThreshold($threshold) - { - if (is_string($threshold)) { - $this->threshold = LoggerOptionConverter::toLevel($threshold, null); - }elseif ($threshold instanceof LoggerLevel) { - $this->threshold = $threshold; - } - } - - /** - * Perform actions before object serialization. - * - * Call {@link finalize()} to properly close the appender. - */ - function __sleep() - { - $this->finalize(); - return array_keys(get_object_vars($this)); - } - - /** - * Perform actions after object de-serialization. - * - * Call {@link activateOptions()} to properly setup the appender. - */ - function __wakeup() - { - $this->activateOptions(); - } - -} diff --git a/thirdparty/apache-log4php/src/main/php/spi/LoggerConfigurator.php b/thirdparty/apache-log4php/src/main/php/LoggerConfigurator.php index 555b6c7..891350a 100644 --- a/thirdparty/apache-log4php/src/main/php/spi/LoggerConfigurator.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerConfigurator.php @@ -1,13 +1,13 @@ inherited. * {@link LOG4PHP_LOGGER_CONFIGURATOR_NULL} is a synonym. @@ -37,26 +32,25 @@ define('LOG4PHP_LOGGER_CONFIGURATOR_INHERITED', 'inherited'); * {@link LOG4PHP_LOGGER_CONFIGURATOR_INHERITED}. * The current value of this string constant is null. */ -define('LOG4PHP_LOGGER_CONFIGURATOR_NULL', 'null'); +define('LOG4PHP_LOGGER_CONFIGURATOR_NULL', 'null'); /** * Implemented by classes capable of configuring log4php using a URL. - * - * @author Marco Vassura - * @version $Revision: 635069 $ + * + * @version $Revision: 771704 $ * @package log4php - * @subpackage spi + * @subpackage spi */ interface LoggerConfigurator { - /** - * Interpret a resource pointed by a url and configure accordingly. - * - * The configuration is done relative to the repository - * parameter. - * - * @param string $url The URL to parse - */ - public static function configure($url=null); - + /** + * Interpret a resource pointed by a url and configure accordingly. + * + * The configuration is done relative to the repository + * parameter. + * + * @param string $url The URL to parse + */ + public static function configure($url = null); + } diff --git a/thirdparty/apache-log4php/src/main/php/LoggerDefaultCategoryFactory.php b/thirdparty/apache-log4php/src/main/php/LoggerDefaultCategoryFactory.php index 36fcf0c..571c7a8 100644 --- a/thirdparty/apache-log4php/src/main/php/LoggerDefaultCategoryFactory.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerDefaultCategoryFactory.php @@ -1,13 +1,13 @@ The {@link decide()} method must return one - * of the integer constants {@link LOG4PHP_LOG4PHP_LOGGER_FILTER_DENY}, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_ACCEPT}. + * of the integer constants {@link LoggerFilter::DENY}, + * {@link LoggerFilter::NEUTRAL} or {@link LoggerFilter::ACCEPT}. * - *If the value {@link LOG4PHP_LOGGER_FILTER_DENY} is returned, then the log event is + *
If the value {@link LoggerFilter::DENY} is returned, then the log event is * dropped immediately without consulting with the remaining * filters. * - *
If the value {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned, then the next filter + *
If the value {@link LoggerFilter::NEUTRAL} is returned, then the next filter * in the chain is consulted. If there are no more filters in the * chain, then the log event is logged. Thus, in the presence of no * filters, the default behaviour is to log all logging events. * - *
If the value {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, then the log + *
If the value {@link LoggerFilter::ACCEPT} is returned, then the log * event is logged without consulting the remaining filters. * *
The philosophy of log4php filters is largely inspired from the * Linux ipchains. * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 779002 $ * @package log4php * @subpackage spi */ -class LoggerFilter { +abstract class LoggerFilter { + + /** + * The log event must be logged immediately without consulting with + * the remaining filters, if any, in the chain. + */ + const ACCEPT = 1; + + /** + * This filter is neutral with respect to the log event. The + * remaining filters, if any, should be consulted for a final decision. + */ + const NEUTRAL = 0; + + /** + * The log event must be dropped immediately without consulting + * with the remaining filters, if any, in the chain. + */ + const DENY = -1; - /** - * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain. - */ - protected $next; + /** + * @var LoggerFilter Points to the next {@link LoggerFilter} in the filter chain. + */ + protected $next; - /** - * Usually filters options become active when set. We provide a - * default do-nothing implementation for convenience. - */ - public function activateOptions() - { - return; - } + /** + * Usually filters options become active when set. We provide a + * default do-nothing implementation for convenience. + */ + public function activateOptions() { + } - /** - * Decide what to do. - *
If the decision is {@link LOG4PHP_LOGGER_FILTER_DENY}, then the event will be - * dropped. If the decision is {@link LOG4PHP_LOGGER_FILTER_NEUTRAL}, then the next - * filter, if any, will be invoked. If the decision is {@link LOG4PHP_LOGGER_FILTER_ACCEPT} then - * the event will be logged without consulting with other filters in - * the chain. - * - * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon. - * @return integer {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} or {@link LOG4PHP_LOGGER_FILTER_DENY}|{@link LOG4PHP_LOGGER_FILTER_ACCEPT} - */ - public function decide($event) - { - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } + /** + * Decide what to do. + *
If the decision is {@link LoggerFilter::DENY}, then the event will be + * dropped. If the decision is {@link LoggerFilter::NEUTRAL}, then the next + * filter, if any, will be invoked. If the decision is {@link LoggerFilter::ACCEPT} then + * the event will be logged without consulting with other filters in + * the chain. + * + * @param LoggerLoggingEvent $event The {@link LoggerLoggingEvent} to decide upon. + * @return integer {@link LoggerFilter::NEUTRAL} or {@link LoggerFilter::DENY}|{@link LoggerFilter::ACCEPT} + */ + public function decide(LoggerLoggingEvent $event) { + return self::NEUTRAL; + } - public function getNext() { - return $this->next; - } + public function getNext() { + return $this->next; + } } diff --git a/thirdparty/apache-log4php/src/main/php/LoggerHierarchy.php b/thirdparty/apache-log4php/src/main/php/LoggerHierarchy.php index 2547655..75dc22b 100644 --- a/thirdparty/apache-log4php/src/main/php/LoggerHierarchy.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerHierarchy.php @@ -1,13 +1,13 @@ The casual user does not have to deal with this class directly.
* *The structure of the logger hierarchy is maintained by the @@ -49,324 +45,235 @@ require_once(LOG4PHP_DIR . '/LoggerDefaultCategoryFactory.php'); * to the provision node. Other descendants of the same ancestor add * themselves to the previously created provision node.
* - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 784933 $ * @package log4php */ + /* + * TODO: + * - addHierarchyEventListener($listener) not supported + * - emitNoAppenderWarning($cat) not supported + * - fireAddAppenderEvent not supported + */ class LoggerHierarchy { + /** Default Factory */ + protected $defaultFactory; + + /** array hierarchy tree. saves here all loggers */ + protected $ht = array(); + + /** The root Logger */ + protected $root = null; + + /** LoggerRendererMap */ + protected $rendererMap; - /** - * @var object currently unused - */ - protected $defaultFactory; - - /** - * @var boolean activate internal logging - * @see LoggerLog - */ - public $debug = false; - - /** - * @var array hierarchy tree. saves here all loggers - */ - protected $ht = array(); - - /** - * @var LoggerRoot - */ - protected $root = null; - - /** - * @var LoggerRendererMap - */ - protected $rendererMap; - - /** - * @var LoggerLevel main level threshold - */ - protected $threshold; - - /** - * @var boolean currently unused - */ - protected $emittedNoAppenderWarning = false; - - /** - * @var boolean currently unused - */ - protected $emittedNoResourceBundleWarning = false; - - public static function singleton() - { - static $instance; - - if (!isset($instance)) - $instance = new LoggerHierarchy(new LoggerRoot()); - return $instance; - } - - /** - * Create a new logger hierarchy. - * @param object $root the root logger - */ - protected function __construct($root) - { - $this->root = $root; - // Enable all level levels by default. - $this->setThreshold(LoggerLevel::getLevelAll()); - $this->root->setHierarchy($this); - $this->rendererMap = new LoggerRendererMap(); - $this->defaultFactory = new LoggerDefaultCategoryFactory(); - } - - /** - * Add a HierarchyEventListener event to the repository. - * Not Yet Impl. - */ - public function addHierarchyEventListener($listener) - { - return; - } - - /** - * Add an object renderer for a specific class. - * @param string $classToRender - * @param LoggerObjectRenderer $or - */ - public function addRenderer($classToRender, $or) - { - $this->rendererMap->put($classToRender, $or); - } - - /** - * This call will clear all logger definitions from the internal hashtable. - */ - public function clear() - { - $this->ht = array(); - } - - public function emitNoAppenderWarning($cat) - { - return; - } - - /** - * Check if the named logger exists in the hierarchy. - * @param string $name - * @return boolean - */ - public function exists($name) - { - return isset($this->ht[$name]); - } + /** LoggerLevel main level threshold */ + protected $threshold; + + /* TODO: In log4j is this class not a singleton. Why is it in log4php? */ + public static function singleton() { + static $instance; + if(!isset($instance)) { + $instance = new LoggerHierarchy(new LoggerRoot()); + } + return $instance; + } + + /** + * Create a new logger hierarchy. + * @param object $root the root logger + */ + public function __construct(LoggerRoot $root) { + $this->root = $root; + $this->root->setHierarchy($this); + $this->setThreshold(LoggerLevel::getLevelAll()); + $this->rendererMap = new LoggerRendererMap(); + $this->defaultFactory = new LoggerDefaultCategoryFactory(); + } + + /** + * Add an object renderer for a specific class. + * @param string $classToRender + * @param LoggerObjectRenderer $or + */ + public function addRenderer($classToRender, $or) { + $this->rendererMap->put($classToRender, $or); + } + + /** + * This call will clear all logger definitions from the internal hashtable. + */ + public function clear() { + $this->ht = array(); + } + + /** + * Check if the named logger exists in the hierarchy. + * @param string $name + * @return boolean + */ + public function exists($name) { + return isset($this->ht[$name]); + } - /** - * Not Implemented. - * @param Logger $logger - * @param LoggerAppender $appender - */ - public function fireAddAppenderEvent($logger, $appender) - { - return; - } - - /** - * @deprecated Please use {@link getCurrentLoggers()} instead. - */ - public function getCurrentCategories() - { - return $this->getCurrentLoggers(); - } - - /** - * Returns all the currently defined categories in this hierarchy as an array. - * @return array - */ - public function getCurrentLoggers() - { - return array_values($this->ht); - } - - /** - * Return a new logger instance named as the first parameter using the default factory. - * - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @return Logger - */ - public function getLogger($name, $factory = null) - { - if ($factory === null) { - return $this->getLoggerByFactory($name, $this->defaultFactory); - } else { - return $this->getLoggerByFactory($name, $factory); - } - } - - /** - * Return a new logger instance named as the first parameter using the default factory. - * - * @param string $name logger name - * @return Logger - * @todo merge with {@link getLogger()} - */ - public function getLoggerByFactory($name, $factory) - { - if (!isset($this->ht[$name])) { - $this->ht[$name] = $factory->makeNewLoggerInstance($name); - $this->ht[$name]->setHierarchy($this); - $nodes = explode('.', $name); - $firstNode = array_shift($nodes); - if ( $firstNode != $name and isset($this->ht[$firstNode])) { - $this->ht[$name]->setParent($this->ht[$firstNode]); - } else { - $this->ht[$name]->setParent($this->root); - } - if (sizeof($nodes) > 0) { - // find parent node - foreach ($nodes as $node) { - $parentNode = "$firstNode.$node"; - if (isset($this->ht[$parentNode]) and $parentNode != $name) { - $this->ht[$name]->setParent($this->ht[$parentNode]); - } - $firstNode .= ".$node"; - } - } - } - return $this->ht[$name]; - } - - /** - * @return LoggerRendererMap Get the renderer map for this hierarchy. - */ - public function getRendererMap() - { - return $this->rendererMap; - } - - /** - * @return LoggerRoot Get the root of this hierarchy. - */ - public function getRootLogger() - { - if (!isset($this->root) or $this->root == null) - $this->root = new LoggerRoot(); - return $this->root; - } - - /** - * @return LoggerLevel Returns the threshold Level. - */ - public function getThreshold() - { - return $this->threshold; - } + /** + * Returns all the currently defined categories in this hierarchy as an array. + * @return array + */ + public function getCurrentLoggers() { + return array_values($this->ht); + } + + /** + * Return a new logger instance named as the first parameter using the default factory. + * + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @return Logger + */ + public function &getLogger($name, $factory = null) { + if($factory === null) { + $factory = $this->defaultFactory; + } + + if(!isset($this->ht[$name])) { + $this->ht[$name] = $factory->makeNewLoggerInstance($name); + $this->ht[$name]->setHierarchy($this); + $nodes = explode('.', $name); + $firstNode = array_shift($nodes); + + // if name is not a first node but another first node is their + if($firstNode != $name and isset($this->ht[$firstNode])) { + $this->ht[$name]->setParent($this->ht[$firstNode]); + } else { + // if there is no father, set root logger as father + $this->ht[$name]->setParent($this->root); + } + + // if there are more nodes than one + if(count($nodes) > 0) { + // find parent node + foreach($nodes as $node) { + $parentNode = "$firstNode.$node"; + if(isset($this->ht[$parentNode]) and $parentNode != $name) { + + $this->ht[$name]->setParent($this->ht[$parentNode]); + } + $firstNode .= ".$node"; + } + } + } + + return $this->ht[$name]; + } + + /** + * @return LoggerRendererMap Get the renderer map for this hierarchy. + */ + public function getRendererMap() { + return $this->rendererMap; + } + + /** + * @return LoggerRoot Get the root of this hierarchy. + */ + public function getRootLogger() { + if(!isset($this->root) or $this->root == null) { + $this->root = new LoggerRoot(); + } + return $this->root; + } + + /** + * @return LoggerLevel Returns the threshold Level. + */ + public function getThreshold() { + return $this->threshold; + } - /** - * This method will return true if this repository is disabled - * for level object passed as parameter and false otherwise. - * @return boolean - */ - public function isDisabled($level) - { - return ($this->threshold->level > $level->level); - } - - /** - * @deprecated Deprecated with no replacement. - */ - public function overrideAsNeeded($override) - { - return; - } - - /** - * Reset all values contained in this hierarchy instance to their - * default. - * - * This removes all appenders from all categories, sets - * the level of all non-root categories to null, - * sets their additivity flag to true and sets the level - * of the root logger to {@link LOGGER_LEVEL_DEBUG}. Moreover, - * message disabling is set its default "off" value. - * - *Existing categories are not removed. They are just reset. - * - *
This method should be used sparingly and with care as it will - * block all logging until it is completed.
- */ - public function resetConfiguration() - { - $root = $this->getRootLogger(); - - $root->setLevel(LoggerLevel::getLevelDebug()); - $this->setThreshold(LoggerLevel::getLevelAll()); - $this->shutDown(); - $loggers = $this->getCurrentLoggers(); - $enumLoggers = sizeof($loggers); - for ($i = 0; $i < $enumLoggers; $i++) { - $loggers[$i]->setLevel(null); - $loggers[$i]->setAdditivity(true); - $loggers[$i]->setResourceBundle(null); - $loggers[$i]->removeAllAppenders(); - } - $this->rendererMap->clear(); - } - - /** - * @deprecated Deprecated with no replacement. - */ - public function setDisableOverride($override) - { - return; - } - - /** - * Used by subclasses to add a renderer to the hierarchy passed as parameter. - * @param string $renderedClass a LoggerRenderer class name - * @param LoggerRenderer $renderer - * - */ - public function setRenderer($renderedClass, $renderer) - { - $this->rendererMap->put($renderedClass, $renderer); - } - - /** - * set a new threshold level - * - * @param LoggerLevel $l - */ - public function setThreshold($l) - { - if ($l !== null) - $this->threshold = $l; - } - - /** - * Shutting down a hierarchy will safely close and remove - * all appenders in all categories including the root logger. - * - *Some appenders such as {@link LoggerSocketAppender} - * need to be closed before the - * application exists. Otherwise, pending logging events might be - * lost. - * - *
The shutdown method is careful to close nested - * appenders before closing regular appenders. This is allows - * configurations where a regular appender is attached to a logger - * and again to a nested appender. - */ - public function shutdown() - { - $this->root->removeAllAppenders(); - $cats = $this->getCurrentLoggers(); - $enumCats = sizeof($cats); - if ($enumCats > 0) { - for ($i = 0; $i < $enumCats; $i++) { - $cats[$i]->removeAllAppenders(); - } - } - } + /** + * This method will return true if this repository is disabled + * for level object passed as parameter and false otherwise. + * @return boolean + */ + public function isDisabled(LoggerLevel $level) { + return ($this->threshold->toInt() > $level->toInt()); + } + + /** + * Reset all values contained in this hierarchy instance to their + * default. + * + * This removes all appenders from all categories, sets + * the level of all non-root categories to null, + * sets their additivity flag to true and sets the level + * of the root logger to {@link LOGGER_LEVEL_DEBUG}. Moreover, + * message disabling is set its default "off" value. + * + *
Existing categories are not removed. They are just reset. + * + *
This method should be used sparingly and with care as it will + * block all logging until it is completed.
+ */ + public function resetConfiguration() { + $root = $this->getRootLogger(); + + $root->setLevel(LoggerLevel::getLevelDebug()); + $this->setThreshold(LoggerLevel::getLevelAll()); + $this->shutDown(); + $loggers = $this->getCurrentLoggers(); + $enumLoggers = count($loggers); + for($i = 0; $i < $enumLoggers; $i++) { + $loggers[$i]->setLevel(null); + $loggers[$i]->setAdditivity(true); + $loggers[$i]->removeAllAppenders(); + } + $this->rendererMap->clear(); + } + + /** + * Used by subclasses to add a renderer to the hierarchy passed as parameter. + * @param string $renderedClass a LoggerRenderer class name + * @param LoggerRenderer $renderer + * + */ + public function setRenderer($renderedClass, $renderer) { + $this->rendererMap->put($renderedClass, $renderer); + } + + /** + * set a new threshold level + * + * @param LoggerLevel $l + */ + public function setThreshold(LoggerLevel $l) { + if($l !== null) { + $this->threshold = $l; + } + } + + /** + * Shutting down a hierarchy will safely close and remove + * all appenders in all categories including the root logger. + * + *Some appenders such as {@link LoggerSocketAppender} + * need to be closed before the + * application exists. Otherwise, pending logging events might be + * lost. + * + *
The shutdown method is careful to close nested + * appenders before closing regular appenders. This is allows + * configurations where a regular appender is attached to a logger + * and again to a nested appender. + */ + public function shutdown() { + $this->root->removeAllAppenders(); + $cats = $this->getCurrentLoggers(); + $enumCats = count($cats); + if($enumCats > 0) { + for($i = 0; $i < $enumCats; $i++) { + $cats[$i]->removeAllAppenders(); + } + } + } } diff --git a/thirdparty/apache-log4php/src/main/php/LoggerLayout.php b/thirdparty/apache-log4php/src/main/php/LoggerLayout.php index 6fb7070..219a6e7 100644 --- a/thirdparty/apache-log4php/src/main/php/LoggerLayout.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerLayout.php @@ -1,13 +1,13 @@ getRenderedMessage(); - } - - /** - * Returns the content type output by this layout. - * @return string - */ - public function getContentType() - { - return "text/plain"; - } - - /** - * Returns the footer for the layout format. - * @return string - */ - public function getFooter() - { - return null; - } + /** + * Override this method to create your own layout format. + * + * @param LoggerLoggingEvent + * @return string + */ + public function format(LoggerLoggingEvent $event) { + return $event->getRenderedMessage(); + } + + /** + * Returns the content type output by this layout. + * @return string + */ + public function getContentType() { + return "text/plain"; + } + + /** + * Returns the footer for the layout format. + * @return string + */ + public function getFooter() { + return null; + } - /** - * Returns the header for the layout format. - * @return string - */ - public function getHeader() - { - return null; - } + /** + * Returns the header for the layout format. + * @return string + */ + public function getHeader() { + return null; + } } diff --git a/thirdparty/apache-log4php/src/main/php/LoggerLevel.php b/thirdparty/apache-log4php/src/main/php/LoggerLevel.php index e83b9ca..cf2fd20 100644 --- a/thirdparty/apache-log4php/src/main/php/LoggerLevel.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerLevel.php @@ -1,13 +1,13 @@ OFF, FATAL, ERROR, * WARN, INFODEBUG and @@ -45,222 +28,230 @@ define('LOG4PHP_LEVEL_ALL_INT', -2147483647); *
The LoggerLevel class may be subclassed to define a larger * level set.
* - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 776571 $ * @package log4php * @since 0.5 */ class LoggerLevel { + + const OFF = 2147483647; + const FATAL = 50000; + const ERROR = 40000; + const WARN = 30000; + const INFO = 20000; + const DEBUG = 10000; + const ALL = -2147483647; - /** - * @var integer - */ - public $level; + /** + * TODO: check if still necessary or to be refactored + * @var integer + */ + private $level; - /** - * @var string - */ - public $levelStr; + /** + * Contains a list of instantiated levels + */ + private static $levelMap; + + /** + * @var string + */ + private $levelStr; - /** - * @var integer - */ - public $syslogEquivalent; + /** + * @var integer + */ + private $syslogEquivalent; - /** - * Constructor - * - * @param integer $level - * @param string $levelStr - * @param integer $syslogEquivalent - */ - public function __construct($level, $levelStr, $syslogEquivalent) - { - $this->level = $level; - $this->levelStr = $levelStr; - $this->syslogEquivalent = $syslogEquivalent; - } + /** + * Constructor + * + * @param integer $level + * @param string $levelStr + * @param integer $syslogEquivalent + */ + private function __construct($level, $levelStr, $syslogEquivalent) { + $this->level = $level; + $this->levelStr = $levelStr; + $this->syslogEquivalent = $syslogEquivalent; + } - /** - * Two priorities are equal if their level fields are equal. - * - * @param object $o - * @return boolean - */ - public function equals($o) - { - if ($o instanceof LoggerLevel) { - return ($this->level == $o->level); - } else { - return false; - } - } - - /** - * Returns an Off Level - * @static - * @return LoggerLevel - */ - public static function getLevelOff() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_OFF_INT, 'OFF', 0); - return $level; - } + /** + * Two priorities are equal if their level fields are equal. + * + * @param object $o + * @return boolean + */ + public function equals($o) { + if($o instanceof LoggerLevel) { + if($this->level == $o->level) { + return true; + } + } else { + return false; + } + } + + /** + * Returns an Off Level + * @static + * @return LoggerLevel + */ + public static function getLevelOff() { + if(!isset(self::$levelMap[LoggerLevel::OFF])) { + self::$levelMap[LoggerLevel::OFF] = new LoggerLevel(LoggerLevel::OFF, 'OFF', 0); + } + return self::$levelMap[LoggerLevel::OFF]; + } - /** - * Returns a Fatal Level - * @static - * @return LoggerLevel - */ - public static function getLevelFatal() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_FATAL_INT, 'FATAL', 0); - return $level; - } - - /** - * Returns an Error Level - * @static - * @return LoggerLevel - */ - public static function getLevelError() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ERROR_INT, 'ERROR', 3); - return $level; - } - - /** - * Returns a Warn Level - * @static - * @return LoggerLevel - */ - public static function getLevelWarn() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_WARN_INT, 'WARN', 4); - return $level; - } + /** + * Returns a Fatal Level + * @static + * @return LoggerLevel + */ + public static function getLevelFatal() { + if(!isset(self::$levelMap[LoggerLevel::FATAL])) { + self::$levelMap[LoggerLevel::FATAL] = new LoggerLevel(LoggerLevel::FATAL, 'FATAL', 0); + } + return self::$levelMap[LoggerLevel::FATAL]; + } + + /** + * Returns an Error Level + * @static + * @return LoggerLevel + */ + public static function getLevelError() { + if(!isset(self::$levelMap[LoggerLevel::ERROR])) { + self::$levelMap[LoggerLevel::ERROR] = new LoggerLevel(LoggerLevel::ERROR, 'ERROR', 3); + } + return self::$levelMap[LoggerLevel::ERROR]; + } + + /** + * Returns a Warn Level + * @static + * @return LoggerLevel + */ + public static function getLevelWarn() { + if(!isset(self::$levelMap[LoggerLevel::WARN])) { + self::$levelMap[LoggerLevel::WARN] = new LoggerLevel(LoggerLevel::WARN, 'WARN', 4); + } + return self::$levelMap[LoggerLevel::WARN]; + } - /** - * Returns an Info Level - * @static - * @return LoggerLevel - */ - public static function getLevelInfo() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_INFO_INT, 'INFO', 6); - return $level; - } + /** + * Returns an Info Level + * @static + * @return LoggerLevel + */ + public static function getLevelInfo() { + if(!isset(self::$levelMap[LoggerLevel::INFO])) { + self::$levelMap[LoggerLevel::INFO] = new LoggerLevel(LoggerLevel::INFO, 'INFO', 6); + } + return self::$levelMap[LoggerLevel::INFO]; + } - /** - * Returns a Debug Level - * @static - * @return LoggerLevel - */ - public static function getLevelDebug() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_DEBUG_INT, 'DEBUG', 7); - return $level; - } + /** + * Returns a Debug Level + * @static + * @return LoggerLevel + */ + public static function getLevelDebug() { + if(!isset(self::$levelMap[LoggerLevel::DEBUG])) { + self::$levelMap[LoggerLevel::DEBUG] = new LoggerLevel(LoggerLevel::DEBUG, 'DEBUG', 7); + } + return self::$levelMap[LoggerLevel::DEBUG]; + } - /** - * Returns an All Level - * @static - * @return LoggerLevel - */ - public static function getLevelAll() - { - static $level; - if (!isset($level)) $level = new LoggerLevel(LOG4PHP_LEVEL_ALL_INT, 'ALL', 7); - return $level; - } - - /** - * Return the syslog equivalent of this priority as an integer. - * @final - * @return integer - */ - public function getSyslogEquivalent() - { - return $this->syslogEquivalent; - } + /** + * Returns an All Level + * @static + * @return LoggerLevel + */ + public static function getLevelAll() { + if(!isset(self::$levelMap[LoggerLevel::ALL])) { + self::$levelMap[LoggerLevel::ALL] = new LoggerLevel(LoggerLevel::ALL, 'ALL', 7); + } + return self::$levelMap[LoggerLevel::ALL]; + } + + /** + * Return the syslog equivalent of this priority as an integer. + * @final + * @return integer + */ + public function getSyslogEquivalent() { + return $this->syslogEquivalent; + } - /** - * Returns true if this level has a higher or equal - * level than the level passed as argument, false - * otherwise. - * - *You should think twice before overriding the default - * implementation of isGreaterOrEqual method. - * - * @param LoggerLevel $r - * @return boolean - */ - public function isGreaterOrEqual($r) - { - return $this->level >= $r->level; - } + /** + * Returns true if this level has a higher or equal + * level than the level passed as argument, false + * otherwise. + * + *
You should think twice before overriding the default + * implementation of isGreaterOrEqual method. + * + * @param LoggerLevel $r + * @return boolean + */ + public function isGreaterOrEqual($r) { + return $this->level >= $r->level; + } - /** - * Returns the string representation of this priority. - * @return string - * @final - */ - public function toString() - { - return $this->levelStr; - } + /** + * Returns the string representation of this priority. + * @return string + * @final + */ + public function toString() { + return $this->levelStr; + } - /** - * Returns the integer representation of this level. - * @return integer - */ - public function toInt() - { - return $this->level; - } + /** + * Returns the integer representation of this level. + * @return integer + */ + public function toInt() { + return $this->level; + } - /** - * Convert the string passed as argument to a level. If the - * conversion fails, then this method returns a DEBUG Level. - * - * @param mixed $arg - * @param LoggerLevel $default - * @static - */ - public static function toLevel($arg, $defaultLevel = null) - { - if ($defaultLevel === null) { - return self::toLevel($arg, self::getLevelDebug()); - } else { - if (is_int($arg)) { - switch($arg) { - case LOG4PHP_LEVEL_ALL_INT: return self::getLevelAll(); - case LOG4PHP_LEVEL_DEBUG_INT: return self::getLevelDebug(); - case LOG4PHP_LEVEL_INFO_INT: return self::getLevelInfo(); - case LOG4PHP_LEVEL_WARN_INT: return self::getLevelWarn(); - case LOG4PHP_LEVEL_ERROR_INT: return self::getLevelError(); - case LOG4PHP_LEVEL_FATAL_INT: return self::getLevelFatal(); - case LOG4PHP_LEVEL_OFF_INT: return self::getLevelOff(); - default: return $defaultLevel; - } - } else { - switch(strtoupper($arg)) { - case 'ALL': return self::getLevelAll(); - case 'DEBUG': return self::getLevelDebug(); - case 'INFO': return self::getLevelInfo(); - case 'WARN': return self::getLevelWarn(); - case 'ERROR': return self::getLevelError(); - case 'FATAL': return self::getLevelFatal(); - case 'OFF': return self::getLevelOff(); - default: return $defaultLevel; - } - } - } - } + /** + * Convert the string passed as argument to a level. If the + * conversion fails, then this method returns a DEBUG Level. + * + * @param mixed $arg + * @param LoggerLevel $default + * @static + */ + public static function toLevel($arg, $defaultLevel = null) { + if($defaultLevel === null) { + return self::toLevel($arg, self::getLevelDebug()); + } else { + if(is_int($arg)) { + switch($arg) { + case self::ALL: return self::getLevelAll(); + case self::DEBUG: return self::getLevelDebug(); + case self::INFO: return self::getLevelInfo(); + case self::WARN: return self::getLevelWarn(); + case self::ERROR: return self::getLevelError(); + case self::FATAL: return self::getLevelFatal(); + case self::OFF: return self::getLevelOff(); + default: return $defaultLevel; + } + } else { + switch(strtoupper($arg)) { + case 'ALL': return self::getLevelAll(); + case 'DEBUG': return self::getLevelDebug(); + case 'INFO': return self::getLevelInfo(); + case 'WARN': return self::getLevelWarn(); + case 'ERROR': return self::getLevelError(); + case 'FATAL': return self::getLevelFatal(); + case 'OFF': return self::getLevelOff(); + default: return $defaultLevel; + } + } + } + } } diff --git a/thirdparty/apache-log4php/src/main/php/spi/LoggerLocationInfo.php b/thirdparty/apache-log4php/src/main/php/LoggerLocationInfo.php index 941adcf..b60b49f 100644 --- a/thirdparty/apache-log4php/src/main/php/spi/LoggerLocationInfo.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerLocationInfo.php @@ -1,13 +1,13 @@ NA is returned. Current value of this string * constant is ?. */ -define('LOG4PHP_LOGGER_LOCATION_INFO_NA', 'NA'); +define('LOG4PHP_LOGGER_LOCATION_INFO_NA', 'NA'); /** * The internal representation of caller location information. * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 771704 $ * @package log4php * @subpackage spi * @since 0.3 */ class LoggerLocationInfo { - /** - * @var string Caller's line number. - */ - protected $lineNumber = null; - - /** - * @var string Caller's file name. - */ - protected $fileName = null; - - /** - * @var string Caller's fully qualified class name. - */ - protected $className = null; - - /** - * @var string Caller's method name. - */ - protected $methodName = null; - - /** - * @var string - */ - protected $fullInfo = null; + /** + * @var string Caller's line number. + */ + protected $lineNumber = null; + + /** + * @var string Caller's file name. + */ + protected $fileName = null; + + /** + * @var string Caller's fully qualified class name. + */ + protected $className = null; + + /** + * @var string Caller's method name. + */ + protected $methodName = null; + + /** + * @var string + */ + protected $fullInfo = null; + + /** + * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}. + * + * @param array $trace + * @param mixed $caller + */ + public function __construct($trace, $fqcn = null) { + $this->lineNumber = isset($trace['line']) ? $trace['line'] : null; + $this->fileName = isset($trace['file']) ? $trace['file'] : null; + $this->className = isset($trace['class']) ? $trace['class'] : null; + $this->methodName = isset($trace['function']) ? $trace['function'] : null; + $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . + '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')'; + } + + public function getClassName() { + return ($this->className === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->className; + } - /** - * Instantiate location information based on a {@link PHP_MANUAL#debug_backtrace}. - * - * @param array $trace - * @param mixed $caller - */ - public function __construct($trace, $fqcn = null) - { - $this->lineNumber = isset($trace['line']) ? $trace['line'] : null; - $this->fileName = isset($trace['file']) ? $trace['file'] : null; - $this->className = isset($trace['class']) ? $trace['class'] : null; - $this->methodName = isset($trace['function']) ? $trace['function'] : null; - - $this->fullInfo = $this->getClassName() . '.' . $this->getMethodName() . - '(' . $this->getFileName() . ':' . $this->getLineNumber() . ')'; - } + /** + * Return the file name of the caller. + *
This information is not always available. + */ + public function getFileName() { + return ($this->fileName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->fileName; + } - public function getClassName() - { - return ($this->className === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->className; - } + /** + * Returns the line number of the caller. + *
This information is not always available. + */ + public function getLineNumber() { + return ($this->lineNumber === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->lineNumber; + } - /** - * Return the file name of the caller. - *
This information is not always available. - */ - public function getFileName() - { - return ($this->fileName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->fileName; - } + /** + * Returns the method name of the caller. + */ + public function getMethodName() { + return ($this->methodName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->methodName; + } - /** - * Returns the line number of the caller. - *
This information is not always available. - */ - public function getLineNumber() - { - return ($this->lineNumber === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->lineNumber; - } + /** + * Returns the full information of the caller. + */ + public function getFullInfo() { + return ($this->fullInfo === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->fullInfo; + } - /** - * Returns the method name of the caller. - */ - public function getMethodName() - { - return ($this->methodName === null) ? LOG4PHP_LOGGER_LOCATION_INFO_NA : $this->methodName; - } } diff --git a/thirdparty/apache-log4php/src/main/php/LoggerLog.php b/thirdparty/apache-log4php/src/main/php/LoggerLog.php deleted file mode 100644 index 60273b6..0000000 --- a/thirdparty/apache-log4php/src/main/php/LoggerLog.php +++ /dev/null @@ -1,101 +0,0 @@ -It uses php {@link PHP_MANUAL#trigger_error trigger_error()} function - * to output messages.
- *You need to recode methods to output messages in a different way.
- * - * @author Marco Vassura - * @version $Revision: 635069 $ - * @package log4php - */ -class LoggerLog { - - protected static $debug = false; - - /** - * Log if debug is enabled. - * - * Log using php {@link PHP_MANUAL#trigger_error trigger_error()} function - * with E_USER_NOTICE level by default. - * - * @param string $message log message - * @param integer $errLevel level to log - * @static - */ - public static function log($message, $errLevel = E_USER_NOTICE) - { - if (LoggerLog::internalDebugging()) - trigger_error($message, $errLevel); - } - - public static function internalDebugging($value = null) - { - if (is_bool($value)) - self::$debug = $value; - return self::$debug; - } - - /** - * Report a debug message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - public static function debug($message) - { - LoggerLog::log($message, E_USER_NOTICE); - } - - /** - * Report an error message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - public static function error($message) - { - trigger_error($message, E_USER_ERROR); - } - - /** - * Report a warning message. - * - * @param string $message log message - * @static - * @since 0.3 - */ - public static function warn($message) - { - trigger_error($message, E_USER_WARNING); - } - -} diff --git a/thirdparty/apache-log4php/src/main/php/spi/LoggerLoggingEvent.php b/thirdparty/apache-log4php/src/main/php/LoggerLoggingEvent.php index e0b039a..7865570 100644 --- a/thirdparty/apache-log4php/src/main/php/spi/LoggerLoggingEvent.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerLoggingEvent.php @@ -1,13 +1,13 @@ This field should not be accessed directly. You shoud use the - * {@link getLevel()} method instead. - * - * @deprecated - * @var LoggerLevel - */ - protected $level; - - /** - * @var string The nested diagnostic context (NDC) of logging event. - */ - var $ndc; - - /** - * Have we tried to do an NDC lookup? If we did, there is no need - * to do it again. Note that its value is always false when - * serialized. Thus, a receiving SocketNode will never use it's own - * (incorrect) NDC. See also writeObject method. - * @var boolean - */ - var $ndcLookupRequired = true; - - /** - * Have we tried to do an MDC lookup? If we did, there is no need - * to do it again. Note that its value is always false when - * serialized. See also the getMDC and getMDCCopy methods. - * @var boolean - */ - var $mdcCopyLookupRequired = true; - - /** - * @var mixed The application supplied message of logging event. - */ - var $message; - - /** - * The application supplied message rendered through the log4php - * objet rendering mechanism. At present renderedMessage == message. - * @var string - */ - var $renderedMessage = null; - - /** - * The name of thread in which this logging event was generated. - * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} - * @var mixed - */ - var $threadName = null; - - /** - * The number of seconds elapsed from 1/1/1970 until logging event - * was created plus microseconds if available. - * @var float - */ - public $timeStamp; - - /** - * @var LoggerLocationInfo Location information for the caller. - */ - var $locationInfo = null; - - /** - * Instantiate a LoggingEvent from the supplied parameters. - * - *Except {@link $timeStamp} all the other fields of - * LoggerLoggingEvent are filled when actually needed. - * - * @param string $fqcn name of the caller class. - * @param mixed $logger The {@link Logger} category of this event or the logger name. - * @param LoggerLevel $priority The level of this event. - * @param mixed $message The message of this event. - * @param integer $timeStamp the timestamp of this logging event. - */ - public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) - { - $this->fqcn = $fqcn; - if ($logger instanceof Logger) { - $this->logger = $logger; - $this->categoryName = $logger->getName(); - } else { - $this->categoryName = strval($logger); - } - $this->level = $priority; - $this->message = $message; - if ($timeStamp !== null && is_float($timeStamp)) { - $this->timeStamp = $timeStamp; - } else { - if (function_exists('microtime')) { - // get microtime as float - $this->timeStamp = microtime(true); - } else { - $this->timeStamp = floatval(time()); - } - } - } + /** + * @var string Fully Qualified Class Name of the calling category class. + */ + var $fqcn; + + /** + * @var Logger reference + */ + var $logger = null; + + /** + * The category (logger) name. + * This field will be marked as private in future + * releases. Please do not access it directly. + * Use the {@link getLoggerName()} method instead. + * @deprecated + */ + var $categoryName; + + /** + * Level of logging event. + *
This field should not be accessed directly. You shoud use the + * {@link getLevel()} method instead. + * + * @deprecated + * @var LoggerLevel + */ + protected $level; + + /** + * @var string The nested diagnostic context (NDC) of logging event. + */ + var $ndc; + + /** + * Have we tried to do an NDC lookup? If we did, there is no need + * to do it again. Note that its value is always false when + * serialized. Thus, a receiving SocketNode will never use it's own + * (incorrect) NDC. See also writeObject method. + * @var boolean + */ + var $ndcLookupRequired = true; + + /** + * Have we tried to do an MDC lookup? If we did, there is no need + * to do it again. Note that its value is always false when + * serialized. See also the getMDC and getMDCCopy methods. + * @var boolean + */ + var $mdcCopyLookupRequired = true; + + /** + * @var mixed The application supplied message of logging event. + */ + var $message; + + /** + * The application supplied message rendered through the log4php + * objet rendering mechanism. At present renderedMessage == message. + * @var string + */ + var $renderedMessage = null; + + /** + * The name of thread in which this logging event was generated. + * log4php saves here the process id via {@link PHP_MANUAL#getmypid getmypid()} + * @var mixed + */ + var $threadName = null; + + /** + * The number of seconds elapsed from 1/1/1970 until logging event + * was created plus microseconds if available. + * @var float + */ + public $timeStamp; + + /** + * @var LoggerLocationInfo Location information for the caller. + */ + var $locationInfo = null; + + /** + * Instantiate a LoggingEvent from the supplied parameters. + * + *
Except {@link $timeStamp} all the other fields of + * LoggerLoggingEvent are filled when actually needed. + * + * @param string $fqcn name of the caller class. + * @param mixed $logger The {@link Logger} category of this event or the logger name. + * @param LoggerLevel $priority The level of this event. + * @param mixed $message The message of this event. + * @param integer $timeStamp the timestamp of this logging event. + */ + public function __construct($fqcn, $logger, $priority, $message, $timeStamp = null) { + $this->fqcn = $fqcn; + if($logger instanceof Logger) { + $this->logger = $logger; + $this->categoryName = $logger->getName(); + } else { + $this->categoryName = strval($logger); + } + $this->level = $priority; + $this->message = $message; + if($timeStamp !== null && is_float($timeStamp)) { + $this->timeStamp = $timeStamp; + } else { + if(function_exists('microtime')) { + // get microtime as float + $this->timeStamp = microtime(true); + } else { + $this->timeStamp = floatval(time()); + } + } + } - /** - * Set the location information for this logging event. The collected - * information is cached for future use. - * - *
This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists) - * to collect informations about caller.
- *It only recognize informations generated by {@link Logger} and its subclasses.
- * @return LoggerLocationInfo - */ - public function getLocationInformation() - { - if($this->locationInfo === null) { + /** + * Set the location information for this logging event. The collected + * information is cached for future use. + * + *This method uses {@link PHP_MANUAL#debug_backtrace debug_backtrace()} function (if exists) + * to collect informations about caller.
+ *It only recognize informations generated by {@link Logger} and its subclasses.
+ * @return LoggerLocationInfo + */ + public function getLocationInformation() { + if($this->locationInfo === null) { - $locationInfo = array(); + $locationInfo = array(); - if (function_exists('debug_backtrace')) { - $trace = debug_backtrace(); - $prevHop = null; - // make a downsearch to identify the caller - $hop = array_pop($trace); - while ($hop !== null) { - $className = @strtolower($hop['class']); - if ( !empty($className) and ($className == 'logger' or $className == 'loggercategory' or - get_parent_class($className) == 'logger') or get_parent_class($className) == 'loggercategory') { - $locationInfo['line'] = $hop['line']; - $locationInfo['file'] = $hop['file']; - break; - } - $prevHop = $hop; - $hop = array_pop($trace); - } - $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main'; - if (isset($prevHop['function']) and - $prevHop['function'] !== 'include' and - $prevHop['function'] !== 'include_once' and - $prevHop['function'] !== 'require' and - $prevHop['function'] !== 'require_once') { - - $locationInfo['function'] = $prevHop['function']; - } else { - $locationInfo['function'] = 'main'; - } - } - - $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn); - } - return $this->locationInfo; - } + if(function_exists('debug_backtrace')) { + $trace = debug_backtrace(); + $prevHop = null; + // make a downsearch to identify the caller + $hop = array_pop($trace); + while($hop !== null) { + $className = @strtolower($hop['class']); + if(!empty($className) and ($className == 'logger' or $className == 'loggercategory' or + @strtolower(get_parent_class($className)) == 'logger' or + @strtolower(get_parent_class($className)) == 'loggercategory')) { + $locationInfo['line'] = $hop['line']; + $locationInfo['file'] = $hop['file']; + break; + } + $prevHop = $hop; + $hop = array_pop($trace); + } + $locationInfo['class'] = isset($prevHop['class']) ? $prevHop['class'] : 'main'; + if(isset($prevHop['function']) and + $prevHop['function'] !== 'include' and + $prevHop['function'] !== 'include_once' and + $prevHop['function'] !== 'require' and + $prevHop['function'] !== 'require_once') { + + $locationInfo['function'] = $prevHop['function']; + } else { + $locationInfo['function'] = 'main'; + } + } + + $this->locationInfo = new LoggerLocationInfo($locationInfo, $this->fqcn); + } + return $this->locationInfo; + } - /** - * Return the level of this event. Use this form instead of directly - * accessing the {@link $level} field. - * @return LoggerLevel - */ - public function getLevel() - { - return $this->level; - } + /** + * Return the level of this event. Use this form instead of directly + * accessing the {@link $level} field. + * @return LoggerLevel + */ + public function getLevel() { + return $this->level; + } - /** - * Return the name of the logger. Use this form instead of directly - * accessing the {@link $categoryName} field. - * @return string - */ - public function getLoggerName() - { - return $this->categoryName; - } + /** + * Return the name of the logger. Use this form instead of directly + * accessing the {@link $categoryName} field. + * @return string + */ + public function getLoggerName() { + return $this->categoryName; + } - /** - * Return the message for this logging event. - * - *Before serialization, the returned object is the message - * passed by the user to generate the logging event. After - * serialization, the returned value equals the String form of the - * message possibly after object rendering. - * @return mixed - */ - public function getMessage() - { - if($this->message !== null) { - return $this->message; - } else { - return $this->getRenderedMessage(); - } - } + /** + * Return the message for this logging event. + * + *
Before serialization, the returned object is the message
+ * passed by the user to generate the logging event. After
+ * serialization, the returned value equals the String form of the
+ * message possibly after object rendering.
+ * @return mixed
+ */
+ public function getMessage() {
+ if($this->message !== null) {
+ return $this->message;
+ } else {
+ return $this->getRenderedMessage();
+ }
+ }
- /**
- * This method returns the NDC for this event. It will return the
- * correct content even if the event was generated in a different
- * thread or even on a different machine. The {@link LoggerNDC::get()} method
- * should never be called directly.
- * @return string
- */
- public function getNDC()
- {
- if ($this->ndcLookupRequired) {
- $this->ndcLookupRequired = false;
- $this->ndc = implode(' ',LoggerNDC::get());
- }
- return $this->ndc;
- }
+ /**
+ * This method returns the NDC for this event. It will return the
+ * correct content even if the event was generated in a different
+ * thread or even on a different machine. The {@link LoggerNDC::get()} method
+ * should never be called directly.
+ * @return string
+ */
+ public function getNDC() {
+ if($this->ndcLookupRequired) {
+ $this->ndcLookupRequired = false;
+ $this->ndc = implode(' ', LoggerNDC::get());
+ }
+ return $this->ndc;
+ }
+ /**
+ * Returns the the context corresponding to the key
+ * parameter.
+ * @return string
+ */
+ public function getMDC($key) {
+ return LoggerMDC::get($key);
+ }
- /**
- * Returns the the context corresponding to the key
- * parameter.
- * @return string
- */
- public function getMDC($key)
- {
- return LoggerMDC::get($key);
- }
+ /**
+ * Render message.
+ * @return string
+ */
+ public function getRenderedMessage() {
+ if($this->renderedMessage === null and $this->message !== null) {
+ if(is_string($this->message)) {
+ $this->renderedMessage = $this->message;
+ } else {
+ if($this->logger !== null) {
+ $repository = $this->logger->getLoggerRepository();
+ } else {
+ $repository = LoggerManager::getLoggerRepository();
+ }
+ if(method_exists($repository, 'getRendererMap')) {
+ $rendererMap = $repository->getRendererMap();
+ $this->renderedMessage= $rendererMap->findAndRender($this->message);
+ } else {
+ $this->renderedMessage = (string)$this->message;
+ }
+ }
+ }
+ return $this->renderedMessage;
+ }
- /**
- * Render message.
- * @return string
- */
- public function getRenderedMessage()
- {
- if($this->renderedMessage === null and $this->message !== null) {
- if (is_string($this->message)) {
- $this->renderedMessage = $this->message;
- } else {
- if ($this->logger !== null) {
- $repository = $this->logger->getLoggerRepository();
- } else {
- $repository = LoggerManager::getLoggerRepository();
- }
- if (method_exists($repository, 'getRendererMap')) {
- $rendererMap = $repository->getRendererMap();
- $this->renderedMessage= $rendererMap->findAndRender($this->message);
- } else {
- $this->renderedMessage = (string)$this->message;
- }
- }
- }
- return $this->renderedMessage;
- }
+ /**
+ * Returns the time when the application started, in seconds
+ * elapsed since 01.01.1970 plus microseconds if available.
+ *
+ * @return float
+ * @static
+ */
+ public static function getStartTime() {
+ if(!isset(self::$startTime)) {
+ if (function_exists('microtime')) {
+ // microtime as float
+ self::$startTime = microtime(true);
+ } else {
+ self::$startTime = floatval(time());
+ }
+ }
+ return self::$startTime;
+ }
- /**
- * Returns the time when the application started, in seconds
- * elapsed since 01.01.1970 plus microseconds if available.
- *
- * @return float
- * @static
- */
- public static function getStartTime() {
- if (!isset(self::$startTime)) {
- if (function_exists('microtime')) {
- // microtime as float
- self::$startTime = microtime(true);
- } else {
- self::$startTime = floatval(time());
- }
- }
- return self::$startTime;
- }
-
- /**
- * @return float
- */
- public function getTimeStamp()
- {
- return $this->timeStamp;
- }
-
- /**
- * @return mixed
- */
- public function getThreadName()
- {
- if ($this->threadName === null)
- $this->threadName = (string)getmypid();
- return $this->threadName;
+ /**
+ * @return float
+ */
+ public function getTimeStamp() {
+ return $this->timeStamp;
+ }
+
+ /**
+ * Calculates the time of this event.
+ * @return the time after event starttime when this event has occured
+ */
+ public function getTime() {
+ $eventTime = (float)$this->getTimeStamp();
+ $eventStartTime = (float)LoggerLoggingEvent::getStartTime();
+ return number_format(($eventTime - $eventStartTime) * 1000, 0, '', '');
}
+
+ /**
+ * @return mixed
+ */
+ public function getThreadName() {
+ if ($this->threadName === null) {
+ $this->threadName = (string)getmypid();
+ }
+ return $this->threadName;
+ }
- /**
- * @return mixed null
- */
- public function getThrowableInformation()
- {
- return null;
- }
-
- /**
- * Serialize this object
- * @return string
- */
- public function toString()
- {
- serialize($this);
- }
-
- /**
- * Avoid serialization of the {@link $logger} object
- */
- public function __sleep()
- {
- return array(
- 'fqcn','categoryName',
- 'level',
- 'ndc','ndcLookupRequired',
- 'message','renderedMessage',
- 'threadName',
- 'timeStamp',
- 'locationInfo'
- );
- }
+ /**
+ * @return mixed null
+ */
+ public function getThrowableInformation() {
+ return null;
+ }
+
+ /**
+ * Serialize this object
+ * @return string
+ */
+ public function toString() {
+ serialize($this);
+ }
+
+ /**
+ * Avoid serialization of the {@link $logger} object
+ */
+ public function __sleep() {
+ return array(
+ 'fqcn',
+ 'categoryName',
+ 'level',
+ 'ndc',
+ 'ndcLookupRequired',
+ 'message',
+ 'renderedMessage',
+ 'threadName',
+ 'timeStamp',
+ 'locationInfo',
+ );
+ }
}
LoggerLoggingEvent::getStartTime();
-
diff --git a/thirdparty/apache-log4php/src/main/php/LoggerMDC.php b/thirdparty/apache-log4php/src/main/php/LoggerMDC.php
index ccaca4c..d54b244 100644
--- a/thirdparty/apache-log4php/src/main/php/LoggerMDC.php
+++ b/thirdparty/apache-log4php/src/main/php/LoggerMDC.php
@@ -1,13 +1,13 @@
The MDC is managed on a per thread basis.
*
- * @author Marco Vassura
- * @version $Revision: 635069 $
+ * @version $Revision: 771183 $
* @since 0.3
* @package log4php
*/
class LoggerMDC {
- /**
- * Put a context value as identified with the key parameter into the current thread's
- * context map.
- *
- *
If the current thread does not have a context map it is - * created as a side effect.
- * - *Note that you cannot put more than {@link LOGGER_MDC_HT_SIZE} keys.
- * - * @param string $key the key - * @param string $value the value - * @static - */ - public static function put($key, $value) - { - if ( sizeof($GLOBALS['log4php.LoggerMDC.ht']) < LOGGER_MDC_HT_SIZE ) - $GLOBALS['log4php.LoggerMDC.ht'][$key] = $value; - } + /** + * Put a context value as identified with the key parameter into the current thread's + * context map. + * + *If the current thread does not have a context map it is + * created as a side effect.
+ * + *Note that you cannot put more than {@link LOGGER_MDC_HT_SIZE} keys.
+ * + * @param string $key the key + * @param string $value the value + * @static + */ + public static function put($key, $value) { + if(count($GLOBALS['log4php.LoggerMDC.ht']) < LOGGER_MDC_HT_SIZE) { + $GLOBALS['log4php.LoggerMDC.ht'][$key] = $value; + } + } - /** - * Get the context identified by the key parameter. - * - *You can use special key identifiers to map values in - * PHP $_SERVER and $_ENV vars. Just put a 'server.' or 'env.' - * followed by the var name you want to refer.
- * - *This method has no side effects.
- * - * @param string $key - * @return string - * @static - */ - public static function get($key) - { - LoggerLog::debug("LoggerMDC::get() key='$key'"); - - if (!empty($key)) { - if (strpos($key, 'server.') === 0) { - $varName = substr($key, 7); - - LoggerLog::debug("LoggerMDC::get() a _SERVER[$varName] is requested."); - - return @$_SERVER[$varName]; - } elseif (strpos($key, 'env.') === 0) { - - $varName = substr($key, 4); - - LoggerLog::debug("LoggerMDC::get() a _ENV[$varName] is requested."); - - return @$_ENV[$varName]; - } elseif (isset($GLOBALS['log4php.LoggerMDC.ht'][$key])) { - - LoggerLog::debug("LoggerMDC::get() a user key is requested."); - - return $GLOBALS['log4php.LoggerMDC.ht'][$key]; - } - } - return ''; - } + /** + * Get the context identified by the key parameter. + * + *You can use special key identifiers to map values in + * PHP $_SERVER and $_ENV vars. Just put a 'server.' or 'env.' + * followed by the var name you want to refer.
+ * + *This method has no side effects.
+ * + * @param string $key + * @return string + * @static + */ + public static function get($key) { + if(!empty($key)) { + if(strpos($key, 'server.') === 0) { + $varName = substr($key, 7); + return @$_SERVER[$varName]; + } else if(strpos($key, 'env.') === 0) { + $varName = substr($key, 4); + return @$_ENV[$varName]; + } else if (isset($GLOBALS['log4php.LoggerMDC.ht'][$key])) { + return $GLOBALS['log4php.LoggerMDC.ht'][$key]; + } + } + return ''; + } - /** - * Remove the the context identified by the key parameter. - * - * It only affects user mappings. - * - * @param string $key - * @return string - * @static - */ - public static function remove($key) - { - unset($GLOBALS['log4php.LoggerMDC.ht'][$key]); - } + /** + * Remove the the context identified by the key parameter. + * + * It only affects user mappings. + * + * @param string $key + * @return string + * @static + */ + public static function remove($key) { + unset($GLOBALS['log4php.LoggerMDC.ht'][$key]); + } } diff --git a/thirdparty/apache-log4php/src/main/php/LoggerManager.php b/thirdparty/apache-log4php/src/main/php/LoggerManager.php index c17c8b2..1a4866d 100644 --- a/thirdparty/apache-log4php/src/main/php/LoggerManager.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerManager.php @@ -1,13 +1,13 @@ exists($name); - } + private static $_classes = array( + 'Logger' => '/Logger.php', + 'LoggerHierarchy' => '/LoggerHierarchy.php', + 'LoggerDefaultCategoryFactory' => '/LoggerDefaultCategoryFactory.php', + 'LoggerHierarchy' => '/LoggerHierarchy.php', + 'LoggerLayout' => '/LoggerLayout.php', + 'LoggerLevel' => '/LoggerLevel.php', + 'LoggerMDC' => '/LoggerMDC.php', + 'LoggerNDC' => '/LoggerNDC.php', + 'LoggerReflectionUtils' => '/LoggerReflectionUtils.php', + 'LoggerConfigurator' => '/LoggerConfigurator.php', + 'LoggerConfiguratorBasic' => '/configurators/LoggerConfiguratorBasic.php', + 'LoggerConfiguratorIni' => '/configurators/LoggerConfiguratorIni.php', + 'LoggerConfiguratorPhp' => '/configurators/LoggerConfiguratorPhp.php', + 'LoggerConfiguratorXml' => '/configurators/LoggerConfiguratorXml.php', + 'LoggerRoot' => '/LoggerRoot.php', + 'LoggerAppender' => '/LoggerAppender.php', + 'LoggerAppenderAdodb' => '/appenders/LoggerAppenderAdodb.php', + 'LoggerAppenderPDO' => '/appenders/LoggerAppenderPDO.php', + 'LoggerAppenderConsole' => '/appenders/LoggerAppenderConsole.php', + 'LoggerAppenderDailyFile' => '/appenders/LoggerAppenderDailyFile.php', + 'LoggerAppenderEcho' => '/appenders/LoggerAppenderEcho.php', + 'LoggerAppenderFile' => '/appenders/LoggerAppenderFile.php', + 'LoggerAppenderMail' => '/appenders/LoggerAppenderMail.php', + 'LoggerAppenderMailEvent' => '/appenders/LoggerAppenderMailEvent.php', + 'LoggerAppenderNull' => '/appenders/LoggerAppenderNull.php', + 'LoggerAppenderPhp' => '/appenders/LoggerAppenderPhp.php', + 'LoggerAppenderRollingFile' => '/appenders/LoggerAppenderRollingFile.php', + 'LoggerAppenderSocket' => '/appenders/LoggerAppenderSocket.php', + 'LoggerAppenderSyslog' => '/appenders/LoggerAppenderSyslog.php', + 'LoggerFormattingInfo' => '/helpers/LoggerFormattingInfo.php', + 'LoggerOptionConverter' => '/helpers/LoggerOptionConverter.php', + 'LoggerPatternConverter' => '/helpers/LoggerPatternConverter.php', + 'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php', + 'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php', + 'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php', + 'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php', + 'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php', + 'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php', + 'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php', + 'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php', + 'LoggerBasicPatternConverter' => '/helpers/LoggerBasicPatternConverter.php', + 'LoggerLiteralPatternConverter' => '/helpers/LoggerLiteralPatternConverter.php', + 'LoggerDatePatternConverter' => '/helpers/LoggerDatePatternConverter.php', + 'LoggerMDCPatternConverter' => '/helpers/LoggerMDCPatternConverter.php', + 'LoggerLocationPatternConverter' => '/helpers/LoggerLocationPatternConverter.php', + 'LoggerNamedPatternConverter' => '/helpers/LoggerNamedPatternConverter.php', + 'LoggerClassNamePatternConverter' => '/helpers/LoggerClassNamePatternConverter.php', + 'LoggerCategoryPatternConverter' => '/helpers/LoggerCategoryPatternConverter.php', + 'LoggerPatternParser' => '/helpers/LoggerPatternParser.php', + 'LoggerLayoutHtml' => '/layouts/LoggerLayoutHtml.php', + 'LoggerLayoutSimple' => '/layouts/LoggerLayoutSimple.php', + 'LoggerLayoutTTCC' => '/layouts/LoggerLayoutTTCC.php', + 'LoggerLayoutPattern' => '/layouts/LoggerLayoutPattern.php', + 'LoggerLayoutXml' => '/layouts/LoggerLayoutXml.php', + 'LoggerRendererDefault' => '/renderers/LoggerRendererDefault.php', + 'LoggerRendererObject' => '/renderers/LoggerRendererObject.php', + 'LoggerRendererMap' => '/renderers/LoggerRendererMap.php', + 'LoggerFactory' => '/LoggerFactory.php', + 'LoggerLocationInfo' => '/LoggerLocationInfo.php', + 'LoggerLoggingEvent' => '/LoggerLoggingEvent.php', + 'LoggerFilter' => '/LoggerFilter.php', + 'LoggerFilterDenyAll' => '/filters/LoggerFilterDenyAll.php', + 'LoggerFilterLevelMatch' => '/filters/LoggerFilterLevelMatch.php', + 'LoggerFilterLevelRange' => '/filters/LoggerFilterLevelRange.php', + 'LoggerFilterStringMatch' => '/filters/LoggerFilterStringMatch.php', + ); - /** - * Returns an array this whole Logger instances. - * - * @static - * @see Logger - * @return array - */ - public static function getCurrentLoggers() - { - return self::getLoggerRepository()->getCurrentLoggers(); - } - - /** - * Returns the root logger. - * - * @static - * @return object - * @see LoggerRoot - */ - public static function getRootLogger() - { - return self::getLoggerRepository()->getRootLogger(); - } - - /** - * Returns the specified Logger. - * - * @param string $name logger name - * @param LoggerFactory $factory a {@link LoggerFactory} instance or null - * @static - * @return Logger - */ - public static function getLogger($name, $factory = null) - { - return self::getLoggerRepository()->getLogger($name, $factory); - } - - /** - * Returns the LoggerHierarchy. - * - * @static - * @return LoggerHierarchy - */ - public static function getLoggerRepository() - { - return LoggerHierarchy::singleton(); - } - + /** + * Class autoloader + * This method is provided to be invoked within an __autoload() magic method. + * @param string class name + */ + public static function autoload($className) { + if(isset(self::$_classes[$className])) { + include LOG4PHP_DIR.self::$_classes[$className]; + } + } - /** - * Destroy loggers object tree. - * - * @static - * @return boolean - */ - public static function resetConfiguration() - { - return self::getLoggerRepository()->resetConfiguration(); - } - - /** - * Does nothing. - * @static - */ - public static function setRepositorySelector($selector, $guard) - { - return; - } - - /** - * Safely close all appenders. - * @static - */ - public static function shutdown() - { - return self::getLoggerRepository()->shutdown(); - } + /** + * check if a given logger exists. + * + * @param string $name logger name + * @static + * @return boolean + */ + public static function exists($name) { + return self::getLoggerRepository()->exists($name); + } + + /** + * Returns an array this whole Logger instances. + * + * @static + * @see Logger + * @return array + */ + public static function getCurrentLoggers() { + return self::getLoggerRepository()->getCurrentLoggers(); + } + + /** + * Returns the root logger. + * + * @static + * @return object + * @see LoggerRoot + */ + public static function getRootLogger() { + return self::getLoggerRepository()->getRootLogger(); + } + + /** + * Returns the specified Logger. + * + * @param string $name logger name + * @param LoggerFactory $factory a {@link LoggerFactory} instance or null + * @static + * @return Logger + */ + public static function getLogger($name, $factory = null) { + return self::getLoggerRepository()->getLogger($name, $factory); + } + + /** + * Returns the LoggerHierarchy. + * + * @static + * @return LoggerHierarchy + */ + public static function getLoggerRepository() { + return LoggerHierarchy::singleton(); + } + + + /** + * Destroy loggers object tree. + * + * @static + * @return boolean + */ + public static function resetConfiguration() { + return self::getLoggerRepository()->resetConfiguration(); + } + + /** + * Does nothing. + * @static + * + * TODO: remove this method? + */ + public static function setRepositorySelector($selector, $guard) { + return; + } + + /** + * Safely close all appenders. + * @static + */ + public static function shutdown() { + return self::getLoggerRepository()->shutdown(); + } } // --------------------------------------------------------------------------- @@ -138,94 +213,95 @@ class LoggerManager { // --------------------------------------------------------------------------- if (!defined('LOG4PHP_DEFAULT_INIT_OVERRIDE')) { - if (isset($_ENV['log4php.defaultInitOverride'])) { - /** - * @ignore - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', - LoggerOptionConverter::toBoolean($_ENV['log4php.defaultInitOverride'], false) - ); - } elseif (isset($GLOBALS['log4php.defaultInitOverride'])) { - /** - * @ignore - */ - define('LOG4PHP_DEFAULT_INIT_OVERRIDE', - LoggerOptionConverter::toBoolean($GLOBALS['log4php.defaultInitOverride'], false) - ); - } else { - /** - * Controls init execution - * - * With this constant users can skip the default init procedure that is - * called when this file is included. - * - *If it is not user defined, log4php tries to autoconfigure using (in order):
- * - * - the$_ENV['log4php.defaultInitOverride'] variable.
- * - the $GLOBALS['log4php.defaultInitOverride'] global variable.
- * - defaults to false
- *
- * @var boolean
- */
- define('LOG4PHP_DEFAULT_INIT_OVERRIDE', false);
- }
+ if (isset($_ENV['log4php.defaultInitOverride'])) {
+ /**
+ * @ignore
+ */
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE',
+ LoggerOptionConverter::toBoolean($_ENV['log4php.defaultInitOverride'], false)
+ );
+ } elseif (isset($GLOBALS['log4php.defaultInitOverride'])) {
+ /**
+ * @ignore
+ */
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE',
+ LoggerOptionConverter::toBoolean($GLOBALS['log4php.defaultInitOverride'], false)
+ );
+ } else {
+ /**
+ * Controls init execution
+ *
+ * With this constant users can skip the default init procedure that is
+ * called when this file is included.
+ *
+ * If it is not user defined, log4php tries to autoconfigure using (in order):
+ * + * - the$_ENV['log4php.defaultInitOverride'] variable.
+ * - the $GLOBALS['log4php.defaultInitOverride'] global variable.
+ * - defaults to false
+ *
+ * @var boolean
+ */
+ define('LOG4PHP_DEFAULT_INIT_OVERRIDE', false);
+ }
}
if (!defined('LOG4PHP_CONFIGURATION')) {
- if (isset($_ENV['log4php.configuration'])) {
- /**
- * @ignore
- */
- define('LOG4PHP_CONFIGURATION', trim($_ENV['log4php.configuration']));
- } else {
- /**
- * Configuration file.
- *
- * This constant tells configurator classes where the configuration - * file is located.
- *If not set by user, log4php tries to set it automatically using - * (in order):
- * - * - the$_ENV['log4php.configuration'] enviroment variable.
- * - defaults to 'log4php.properties'.
- *
- * @var string
- */
- define('LOG4PHP_CONFIGURATION', 'log4php.properties');
- }
+ if (isset($_ENV['log4php.configuration'])) {
+ /**
+ * @ignore
+ */
+ define('LOG4PHP_CONFIGURATION', trim($_ENV['log4php.configuration']));
+ } else {
+ /**
+ * Configuration file.
+ *
+ * This constant tells configurator classes where the configuration + * file is located.
+ *If not set by user, log4php tries to set it automatically using + * (in order):
+ * + * - the$_ENV['log4php.configuration'] enviroment variable.
+ * - defaults to 'log4php.properties'.
+ *
+ * @var string
+ */
+ define('LOG4PHP_CONFIGURATION', 'log4php.properties');
+ }
}
if (!defined('LOG4PHP_CONFIGURATOR_CLASS')) {
- if ( strtolower(substr( LOG4PHP_CONFIGURATION, -4 )) == '.xml') {
- /**
- * @ignore
- */
- define('LOG4PHP_CONFIGURATOR_CLASS', LOG4PHP_DIR . '/xml/LoggerDOMConfigurator');
- } else {
- /**
- * Holds the configurator class name.
- *
- * This constant is set with the fullname (path included but non the - * .php extension) of the configurator class that init procedure will use.
- *If not set by user, log4php tries to set it automatically.
- *If {@link LOG4PHP_CONFIGURATION} has '.xml' extension set the - * constants to '{@link LOG4PHP_DIR}/xml/{@link LoggerDOMConfigurator}'.
- *Otherwise set the constants to - * '{@link LOG4PHP_DIR}/{@link LoggerPropertyConfigurator}'.
- * - *Security Note: classfile pointed by this constant will be brutally
- * included with a:
- * @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php");
This constant is set with the fullname (path included but non the + * .php extension) of the configurator class that init procedure will use.
+ *If not set by user, log4php tries to set it automatically.
+ *If {@link LOG4PHP_CONFIGURATION} has '.xml' extension set the + * constants to '{@link LOG4PHP_DIR}/xml/{@link LoggerConfiguratorXml}'.
+ *Otherwise set the constants to + * '{@link LOG4PHP_DIR}/{@link LoggerConfiguratorIni}'.
+ * + *Security Note: classfile pointed by this constant will be brutally
+ * included with a:
+ * @include_once(LOG4PHP_CONFIGURATOR_CLASS . ".php");
LoggerNDC::push()
+ * As a side effect, if there is no nested diagnostic context for the
+ * current thread, this method will create it.
* - When leaving a context, call
- * LoggerNDC::pop()
+ * LoggerNDC::pop()
* - When exiting a thread make sure to call {@link remove()}
- *
+ *
* There is no penalty for forgetting to match each
* push operation with a corresponding pop,
* except the obvious mismatch between the real application context
@@ -92,151 +83,129 @@ $GLOBALS['log4php.LoggerNDC.maxDepth'] = LOGGER_NDC_HT_SIZE;
* the same category) can still be distinguished because each client
* request will have a different NDC tag.
This method is equivalent to calling the {@link setMaxDepth()} - * method with a zero maxDepth argument. - * - * @static - */ - public static function clear() - { - LoggerLog::debug("LoggerNDC::clear()"); - - $GLOBALS['log4php.LoggerNDC.ht'] = array(); - } + /** + * Clear any nested diagnostic information if any. This method is + * useful in cases where the same thread can be potentially used + * over and over in different unrelated contexts. + * + *
This method is equivalent to calling the {@link setMaxDepth()} + * method with a zero maxDepth argument. + * + * @static + */ + public static function clear() { + $GLOBALS['log4php.LoggerNDC.ht'] = array(); + } - /** - * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead. - * @static - * @return array - */ - public static function get() - { - LoggerLog::debug("LoggerNDC::get()"); - - return $GLOBALS['log4php.LoggerNDC.ht']; - } + /** + * Never use this method directly, use the {@link LoggerLoggingEvent::getNDC()} method instead. + * @static + * @return array + */ + public static function get() { + if(!array_key_exists('log4php.LoggerNDC.ht', $GLOBALS)) { + LoggerNDC::clear(); + } + return $GLOBALS['log4php.LoggerNDC.ht']; + } - /** - * Get the current nesting depth of this diagnostic context. - * - * @see setMaxDepth() - * @return integer - * @static - */ - public static function getDepth() - { - LoggerLog::debug("LoggerNDC::getDepth()"); - - return sizeof($GLOBALS['log4php.LoggerNDC.ht']); - } + /** + * Get the current nesting depth of this diagnostic context. + * + * @see setMaxDepth() + * @return integer + * @static + */ + public static function getDepth() { + return count($GLOBALS['log4php.LoggerNDC.ht']); + } - /** - * Clients should call this method before leaving a diagnostic - * context. - * - *
The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is returned.
- * - * @return string The innermost diagnostic context. - * @static - */ - public static function pop() - { - LoggerLog::debug("LoggerNDC::pop()"); - - if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { - return array_pop($GLOBALS['log4php.LoggerNDC.ht']); - } else { - return ''; - } - } + /** + * Clients should call this method before leaving a diagnostic + * context. + * + *The returned value is the value that was pushed last. If no + * context is available, then the empty string "" is returned.
+ * + * @return string The innermost diagnostic context. + * @static + */ + public static function pop() { + if(count($GLOBALS['log4php.LoggerNDC.ht']) > 0) { + return array_pop($GLOBALS['log4php.LoggerNDC.ht']); + } else { + return ''; + } + } - /** - * Looks at the last diagnostic context at the top of this NDC - * without removing it. - * - *The returned value is the value that was pushed last. If no - * context is available, then the empty string "" is returned.
- * @return string The innermost diagnostic context. - * @static - */ - public static function peek() - { - LoggerLog::debug("LoggerNDC::peek()"); - - if (sizeof($GLOBALS['log4php.LoggerNDC.ht']) > 0) { - return end($GLOBALS['log4php.LoggerNDC.ht']); - } else { - return ''; - } - } + /** + * Looks at the last diagnostic context at the top of this NDC + * without removing it. + * + *The returned value is the value that was pushed last. If no + * context is available, then the empty string "" is returned.
+ * @return string The innermost diagnostic context. + * @static + */ + public static function peek(){ + if(count($GLOBALS['log4php.LoggerNDC.ht']) > 0) { + return end($GLOBALS['log4php.LoggerNDC.ht']); + } else { + return ''; + } + } - /** - * Push new diagnostic context information for the current thread. - * - *The contents of the message parameter is - * determined solely by the client. - * - * @param string $message The new diagnostic context information. - * @static - */ - public static function push($message) - { - LoggerLog::debug("LoggerNDC::push()"); - - array_push($GLOBALS['log4php.LoggerNDC.ht'], (string)$message); - } + /** + * Push new diagnostic context information for the current thread. + * + *
The contents of the message parameter is + * determined solely by the client. + * + * @param string $message The new diagnostic context information. + * @static + */ + public static function push($message) { + array_push($GLOBALS['log4php.LoggerNDC.ht'], (string)$message); + } - /** - * Remove the diagnostic context for this thread. - * @static - */ - public static function remove() - { - LoggerLog::debug("LoggerNDC::remove()"); - - LoggerNDC::clear(); - } + /** + * Remove the diagnostic context for this thread. + * @static + */ + public static function remove() { + LoggerNDC::clear(); + } + + /** + * Set maximum depth of this diagnostic context. If the current + * depth is smaller or equal to maxDepth, then no + * action is taken. + * + *
This method is a convenient alternative to multiple + * {@link pop()} calls. Moreover, it is often the case that at + * the end of complex call sequences, the depth of the NDC is + * unpredictable. The {@link setMaxDepth()} method circumvents + * this problem. + * + * @param integer $maxDepth + * @see getDepth() + * @static + */ + public static function setMaxDepth($maxDepth) { + $maxDepth = (int)$maxDepth; + if($maxDepth <= LOGGER_NDC_HT_SIZE) { + if(LoggerNDC::getDepth() > $maxDepth) { + $GLOBALS['log4php.LoggerNDC.ht'] = array_slice($GLOBALS['log4php.LoggerNDC.ht'], $maxDepth); + } + $GLOBALS['log4php.LoggerNDC.maxDepth'] = $maxDepth; + } + } - /** - * Set maximum depth of this diagnostic context. If the current - * depth is smaller or equal to maxDepth, then no - * action is taken. - * - *
This method is a convenient alternative to multiple
- * {@link pop()} calls. Moreover, it is often the case that at
- * the end of complex call sequences, the depth of the NDC is
- * unpredictable. The {@link setMaxDepth()} method circumvents
- * this problem.
- *
- * @param integer $maxDepth
- * @see getDepth()
- * @static
- */
- public static function setMaxDepth($maxDepth)
- {
- LoggerLog::debug("LoggerNDC::setMaxDepth() maxDepth='$maxDepth'");
-
- $maxDepth = (int)$maxDepth;
- if ($maxDepth <= LOGGER_NDC_HT_SIZE) {
- if (LoggerNDC::getDepth() > $maxDepth) {
- $GLOBALS['log4php.LoggerNDC.ht'] = array_slice($GLOBALS['log4php.LoggerNDC.ht'], $maxDepth);
- }
- $GLOBALS['log4php.LoggerNDC.maxDepth'] = $maxDepth;
- }
- }
-
}
diff --git a/thirdparty/apache-log4php/src/main/php/config/LoggerPropertySetter.php b/thirdparty/apache-log4php/src/main/php/LoggerReflectionUtils.php
index da57374..7ad3474 100644
--- a/thirdparty/apache-log4php/src/main/php/config/LoggerPropertySetter.php
+++ b/thirdparty/apache-log4php/src/main/php/LoggerReflectionUtils.php
@@ -1,13 +1,13 @@
obj =& $obj;
+ }
+
+ /**
+ * Set the properties of an object passed as a parameter in one
+ * go. The properties are parsed relative to a
+ * prefix.
+ *
+ * @param object &$obj The object to configure.
+ * @param array $properties An array containing keys and values.
+ * @param string $prefix Only keys having the specified prefix will be set.
+ * @static
+ */
+ // TODO: check, if this is really useful
+ public static function setPropertiesByObject(&$obj, $properties, $prefix) {
+ $pSetter = new LoggerReflectionUtils($obj);
+ return $pSetter->setProperties($properties, $prefix);
+ }
+
-/**
- * @ignore
- */
-if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..');
-
-require_once(LOG4PHP_DIR . '/LoggerLog.php');
-require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php');
-
-/**
- * General purpose Object property setter. Clients repeatedly invokes
- * {@link setProperty()} in order to invoke setters
- * on the Object specified in the constructor.
- *
- * Usage:
- *
- * $ps = new LoggerPropertySetter($anObject);
- * $ps->set("name", "Joe");
- * $ps->set("age", 32);
- * $ps->set("isMale", true);
- *
- * will cause the invocations
- *
- * $anObject->setName("Joe");
- * $anObject->setAge(32);
- * $anObject->setMale(true)
- *
- * if such methods exist.
- *
- * @author Marco Vassura
- * @version $Revision: 635069 $
- * @package log4php
- * @subpackage config
- * @since 0.5
- */
-class LoggerPropertySetter {
-
- /**
- * @var object the target object
- * @access private
+ /**
+ * Set the properites for the object that match the
+ * prefix passed as parameter.
+ *
+ * Example:
+ *
+ * $arr['xxxname'] = 'Joe';
+ * $arr['xxxmale'] = true;
+ * and prefix xxx causes setName and setMale.
+ *
+ * @param array $properties An array containing keys and values.
+ * @param string $prefix Only keys having the specified prefix will be set.
+ */
+ // TODO: check, if this is really useful
+ public function setProperties($properties, $prefix) {
+ $len = strlen($prefix);
+ while(list($key,) = each($properties)) {
+ if(strpos($key, $prefix) === 0) {
+ if(strpos($key, '.', ($len + 1)) > 0) {
+ continue;
+ }
+ $value = LoggerOptionConverter::findAndSubst($key, $properties);
+ $key = substr($key, $len);
+ if($key == 'layout' and ($this->obj instanceof LoggerAppender)) {
+ continue;
+ }
+ $this->setProperty($key, $value);
+ }
+ }
+ $this->activate();
+ }
+
+ /**
+ * Set a property on this PropertySetter's Object. If successful, this
+ * method will invoke a setter method on the underlying Object. The
+ * setter is the one for the specified property name and the value is
+ * determined partly from the setter argument type and partly from the
+ * value specified in the call to this method.
+ *
+ *
If the setter expects a String no conversion is necessary.
+ * If it expects an int, then an attempt is made to convert 'value'
+ * to an int using new Integer(value). If the setter expects a boolean,
+ * the conversion is by new Boolean(value).
+ *
+ * @param string $name name of the property
+ * @param string $value String value of the property
+ */
+ public function setProperty($name, $value) {
+ if($value === null) {
+ return;
+ }
+
+ $method = "set" . ucfirst($name);
+
+ if(!method_exists($this->obj, $method)) {
+ // no such setter method
+ return;
+ } else {
+ return call_user_func(array(&$this->obj, $method), $value);
+ }
+ }
+
+ public function activate() {
+ if(method_exists($this->obj, 'activateoptions')) {
+ return call_user_func(array(&$this->obj, 'activateoptions'));
+ }
+ }
+
+ /**
+ * Creates an instances from the given class name.
+ *
+ * @param string $classname
+ * @return an object from the class with the given classname
+ */
+ public static function createObject($class) {
+ if(!empty($class)) {
+ $class = basename($class);
+ return new $class();
+ }
+ return null;
+ }
+
+ /**
+ * @param object $object
+ * @param string $name
+ * @param mixed $value
*/
- var $obj;
-
- /**
- * Create a new LoggerPropertySetter for the specified Object.
- * This is done in prepartion for invoking {@link setProperty()}
- * one or more times.
- * @param object &$obj the object for which to set properties
- */
- function LoggerPropertySetter(&$obj)
- {
- $this->obj =& $obj;
- }
-
- /**
- * Set the properties of an object passed as a parameter in one
- * go. The properties are parsed relative to a
- * prefix.
- *
- * @param object &$obj The object to configure.
- * @param array $properties An array containing keys and values.
- * @param string $prefix Only keys having the specified prefix will be set.
- * @static
- */
- public static
- function setPropertiesByObject(&$obj, $properties, $prefix)
- {
- $pSetter = new LoggerPropertySetter($obj);
- return $pSetter->setProperties($properties, $prefix);
- }
-
-
- /**
- * Set the properites for the object that match the
- * prefix passed as parameter.
- *
- * @param array $properties An array containing keys and values.
- * @param string $prefix Only keys having the specified prefix will be set.
- */
- function setProperties($properties, $prefix)
- {
- LoggerLog::debug("LoggerOptionConverter::setProperties():prefix=[{$prefix}]");
-
- $len = strlen($prefix);
- while (list($key,) = each($properties)) {
- if (strpos($key, $prefix) === 0) {
- if (strpos($key, '.', ($len + 1)) > 0)
- continue;
- $value = LoggerOptionConverter::findAndSubst($key, $properties);
- $key = substr($key, $len);
- if ($key == 'layout' and $this->obj instanceof loggerappender) {
- continue;
- }
- $this->setProperty($key, $value);
- }
- }
- $this->activate();
- }
-
- /**
- * Set a property on this PropertySetter's Object. If successful, this
- * method will invoke a setter method on the underlying Object. The
- * setter is the one for the specified property name and the value is
- * determined partly from the setter argument type and partly from the
- * value specified in the call to this method.
- *
- *
If the setter expects a String no conversion is necessary. - * If it expects an int, then an attempt is made to convert 'value' - * to an int using new Integer(value). If the setter expects a boolean, - * the conversion is by new Boolean(value). - * - * @param string $name name of the property - * @param string $value String value of the property - */ - function setProperty($name, $value) - { - LoggerLog::debug("LoggerOptionConverter::setProperty():name=[{$name}]:value=[{$value}]"); - - if ($value === null) return; - - $method = "set" . ucfirst($name); - - if (!method_exists($this->obj, $method)) { - LoggerLog::warn( - "LoggerOptionConverter::setProperty() No such setter method for [{$name}] property in " . - get_class($this->obj) . "." - ); - } else { - return call_user_func(array(&$this->obj, $method), $value); + function setter(&$object, $name, $value) { + if (empty($name)) { + return false; } - } - - function activate() - { - LoggerLog::debug("LoggerOptionConverter::activate()"); - - if (method_exists($this->obj, 'activateoptions')) { - return call_user_func(array(&$this->obj, 'activateoptions')); + $methodName = 'set'.ucfirst($name); + if (method_exists($object, $methodName)) { + return call_user_func(array(&$object, $methodName), $value); } else { - LoggerLog::debug("LoggerOptionConverter::activate() Nothing to activate."); + return false; } } + } + + ?> \ No newline at end of file diff --git a/thirdparty/apache-log4php/src/main/php/LoggerRoot.php b/thirdparty/apache-log4php/src/main/php/LoggerRoot.php index 16b70ec..abc74f6 100644 --- a/thirdparty/apache-log4php/src/main/php/LoggerRoot.php +++ b/thirdparty/apache-log4php/src/main/php/LoggerRoot.php @@ -1,13 +1,13 @@ name); + if($level == null) { + $level = LoggerLevel::getLevelAll(); + } + $this->setLevel($level); + } + + /** + * @return LoggerLevel the level + */ + public function getChainedLevel() { + return parent::getLevel(); + } + + /** + * Setting a null value to the level of the root category may have catastrophic results. + * @param LoggerLevel $level + */ + public function setLevel($level) { + if($level != null) { + parent::setLevel($level); + } + } + + /** + * Always returns false. + * Because LoggerRoot has no parents, it returns false. + * @param Logger $parent + * @return boolean + */ + public function setParent(Logger $parent) { + return false; + } - /** - * Constructor - * - * @param integer $level initial log level - */ - public function __construct($level = null) - { - parent::__construct($this->name); - if ($level == null) - $level = LoggerLevel::getLevelAll(); - $this->setLevel($level); - } - - /** - * @return LoggerLevel the level - */ - public function getChainedLevel() - { - return $this->level; - } - - /** - * Setting a null value to the level of the root category may have catastrophic results. - * @param LoggerLevel $level - */ - public function setLevel($level) - { - if ($level != null) { - $this->level = $level; - } - } - - /** - * Please use setLevel() instead. - * @param LoggerLevel $level - * @deprecated - */ - public function setPriority($level) - { - $this->setLevel($level); - } - - /** - * Always returns false. - * Because LoggerRoot has no parents, it returns false. - * @param Logger $parent - * @return boolean - */ - public function setParent($parent) - { - return false; - } } diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderAdodb.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderAdodb.php index 531fade..ad6feca 100644 --- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderAdodb.php +++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderAdodb.php @@ -20,15 +20,6 @@ * @subpackage appenders */ -/** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -require_once(LOG4PHP_DIR . '/LoggerAppenderSkeleton.php'); -require_once(LOG4PHP_DIR . '/helpers/LoggerOptionConverter.php'); -require_once(LOG4PHP_DIR . '/LoggerLog.php'); - require_once(ADODB_DIR . '/adodb.inc.php'); /** @@ -39,12 +30,12 @@ require_once(ADODB_DIR . '/adodb.inc.php'); * {@link $database}, {@link $createTable}, {@link $table} and {@link $sql}.
*See examples in test directory.
* - * @author sbwNote: Use this Appender with command-line php scripts. * On web scripts this appender has no effects.
- *This appender requires a layout.
+ *This appender requires a layout.
* - * @author Marco Vassura - * @author Knut UrdalenParameters are {@link $dsn}, {@link $createTable}, {@link table} and {@link $sql}.
- *See examples in test directory.
- * - * @author Marco Vassura - * @version $Revision: 635069 $ - * @package log4php - * @subpackage appenders - * @since 0.3 - */ -class LoggerAppenderDb extends LoggerAppenderSkeleton { - - /** - * Create the log table if it does not exists (optional). - * @var boolean - */ - var $createTable = true; - - /** - * PEAR::Db Data source name. Read PEAR::Db for dsn syntax (mandatory). - * @var string - */ - var $dsn; - - /** - * A {@link LoggerPatternLayout} string used to format a valid insert query (mandatory). - * @var string - */ - var $sql; - - /** - * Table name to write events. Used only if {@link $createTable} is true. - * @var string - */ - var $table; - - /** - * @var object PEAR::Db instance - * @access private - */ - var $db = null; - - /** - * @var boolean used to check if all conditions to append are true - * @access private - */ - var $canAppend = true; - - /** - * @access private - */ - var $requiresLayout = false; - - /** - * Constructor. - * - * @param string $name appender name - */ - function LoggerAppenderDb($name) - { - $this->LoggerAppenderSkeleton($name); - } - - /** - * Setup db connection. - * Based on defined options, this method connects to db defined in {@link $dsn} - * and creates a {@link $table} table if {@link $createTable} is true. - * @return boolean true if all ok. - */ - function activateOptions() - { - $this->db = DB::connect($this->dsn); - - if (DB::isError($this->db)) { - LoggerLog::debug("LoggerAppenderDb::activateOptions() DB Connect Error [".$this->db->getMessage()."]"); - $this->db = null; - $this->closed = true; - $this->canAppend = false; - - } else { - - $this->layout = LoggerLayout::factory('LoggerPatternLayout'); - $this->layout->setConversionPattern($this->getSql()); - - // test if log table exists - $tableInfo = $this->db->tableInfo($this->table, $mode = null); - if (DB::isError($tableInfo) and $this->getCreateTable()) { - $query = "CREATE TABLE {$this->table} (timestamp varchar(32),logger varchar(32),level varchar(32),message varchar(64),thread varchar(32),file varchar(64),line varchar(4) );"; - - LoggerLog::debug("LoggerAppenderDb::activateOptions() creating table '{$this->table}'... using sql='$query'"); - - $result = $this->db->query($query); - if (DB::isError($result)) { - LoggerLog::debug("LoggerAppenderDb::activateOptions() error while creating '{$this->table}'. Error is ".$result->getMessage()); - $this->closed = true; - $this->canAppend = false; - return; - } - } - $this->canAppend = true; - $this->closed = false; - } - - } - - function append($event) - { - if ($this->canAppend) { - - $query = $this->layout->format($event); - - LoggerLog::debug("LoggerAppenderDb::append() query='$query'"); - - $this->db->query($query); - } - } - - function close() - { - if ($this->db !== null) - $this->db->disconnect(); - $this->closed = true; - } - - /** - * @return boolean - */ - function getCreateTable() - { - return $this->createTable; - } - - /** - * @return string the defined dsn - */ - function getDsn() - { - return $this->dsn; - } - - /** - * @return string the sql pattern string - */ - function getSql() - { - return $this->sql; - } - - /** - * @return string the table name to create - */ - function getTable() - { - return $this->table; - } - - function setCreateTable($flag) - { - $this->createTable = LoggerOptionConverter::toBoolean($flag, true); - } - - function setDsn($newDsn) - { - $this->dsn = $newDsn; - } - - function setSql($sql) - { - $this->sql = $sql; - } - - function setTable($table) - { - $this->table = $table; - } - -} - diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderEcho.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderEcho.php index 3819c21..b9dcf48 100644 --- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderEcho.php +++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderEcho.php @@ -1,13 +1,13 @@ This appender requires a layout. + *This appender requires a layout.
* - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 771557 $ * @package log4php * @subpackage appenders */ -class LoggerAppenderEcho extends LoggerAppenderSkeleton { - - /** - * @access private - */ - var $requiresLayout = true; - - /** - * @var boolean used internally to mark first append - * @access private - */ - var $firstAppend = true; - - function activateOptions() - { - $this->closed = false; - return; - } - - function close() - { - if (!$this->firstAppend) - echo $this->layout->getFooter(); - $this->closed = true; - } +class LoggerAppenderEcho extends LoggerAppender { + /** boolean used internally to mark first append */ + private $firstAppend = true; + + public function __construct($name) { + parent::__construct($name); + $this->requiresLayout = true; + $this->firstAppend = true; + } + + public function activateOptions() { + $this->closed = false; + } + + public function close() { + if(!$this->firstAppend) { + echo $this->layout->getFooter(); + } + $this->closed = true; + } - function append($event) - { - LoggerLog::debug("LoggerAppenderEcho::append()"); - - if ($this->layout !== null) { - if ($this->firstAppend) { - echo $this->layout->getHeader(); - $this->firstAppend = false; - } - echo $this->layout->format($event); - } - } + public function append($event) { + if($this->layout !== null) { + if($this->firstAppend) { + echo $this->layout->getHeader(); + $this->firstAppend = false; + } + echo $this->layout->format($event); + } + } } diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderFile.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderFile.php index 7df66aa..6a0f07f 100644 --- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderFile.php +++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderFile.php @@ -1,13 +1,13 @@ file), * {@link $append}. * - * @author Marco Vassura - * @author Knut UrdalenThis appender requires a layout.
* - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 771547 $ * @package log4php * @subpackage appenders */ -class LoggerAppenderMail extends LoggerAppenderSkeleton { +class LoggerAppenderMail extends LoggerAppender { - /** - * @var string 'from' field - */ - var $from = null; + /** + * @var string 'from' field + */ + var $from = null; - /** - * @var string 'subject' field - */ - var $subject = 'Log4php Report'; - - /** - * @var string 'to' field - */ - var $to = null; + /** + * @var string 'subject' field + */ + var $subject = 'Log4php Report'; + + /** + * @var string 'to' field + */ + var $to = null; - /** - * @var string used to create mail body - * @access private - */ - var $body = ''; - - /** - * Constructor. - * - * @param string $name appender name - */ - public function __construct($name) { - parent::__construct($name); - $this->requiresLayout = true; - } + /** + * @var string used to create mail body + * @access private + */ + var $body = ''; + + /** + * Constructor. + * + * @param string $name appender name + */ + public function __construct($name) { + parent::__construct($name); + $this->requiresLayout = true; + } - public function activateOptions() { - $this->closed = false; - } - - public function close() { - $from = $this->from; - $to = $this->to; + public function activateOptions() { + $this->closed = false; + } + + public function close() { + $from = $this->from; + $to = $this->to; - if (!empty($this->body) and $from !== null and $to !== null and $this->layout !== null) { - $subject = $this->subject; - LoggerLog::debug("LoggerAppenderMail::close() sending mail from=[{$from}] to=[{$to}] subject=[{$subject}]"); - mail( - $to, $subject, - $this->layout->getHeader() . $this->body . $this->layout->getFooter(), - "From: {$from}\r\n" - ); - } - $this->closed = true; - } - - /** - * @return string - */ - function getFrom() - { - return $this->from; - } - - /** - * @return string - */ - function getSubject() - { - return $this->subject; - } + if(!empty($this->body) and $from !== null and $to !== null and $this->layout !== null) { + $subject = $this->subject; + mail( + $to, $subject, + $this->layout->getHeader() . $this->body . $this->layout->getFooter(), + "From: {$from}\r\n" + ); + } + $this->closed = true; + } + + /** + * @return string + */ + function getFrom() { + return $this->from; + } + + /** + * @return string + */ + function getSubject() { + return $this->subject; + } - /** - * @return string - */ - function getTo() - { - return $this->to; - } - - function setSubject($subject) - { - $this->subject = $subject; - } - - function setTo($to) - { - $this->to = $to; - } + /** + * @return string + */ + function getTo() { + return $this->to; + } + + function setSubject($subject) { + $this->subject = $subject; + } + + function setTo($to) { + $this->to = $to; + } - function setFrom($from) - { - $this->from = $from; - } + function setFrom($from) { + $this->from = $from; + } - function append($event) - { - if ($this->layout !== null) - $this->body .= $this->layout->format($event); - } + function append($event) { + if($this->layout !== null) { + $this->body .= $this->layout->format($event); + } + } } diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderMailEvent.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderMailEvent.php index 8405fcb..d735fb3 100644 --- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderMailEvent.php +++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderMailEvent.php @@ -1,13 +1,13 @@ Parameters are @@ -41,132 +31,143 @@ require_once(LOG4PHP_DIR . '/LoggerLog.php'); * {@link $subject} (optional). *A layout is required.
* - * @author Domenico LordiParameters are {@link $host}, {@link $user}, {@link $password}, + * {@link $database}, {@link $createTable}, {@link $table} and {@link $sql}.
+ * + * @package log4php + * @subpackage appenders + * @since 2.0 + */ +class LoggerAppenderPDO extends LoggerAppender { + /** Create the log table if it does not exists (optional). */ + private $createTable = true; + + /** Database user name */ + private $user = ''; + + /** Database password */ + private $password = ''; + + /** DSN string for enabling a connection */ + private $dsn; + + /** A {@link LoggerPatternLayout} string used to format a valid insert query (mandatory) */ + private $sql; + + /** Table name to write events. Used only if {@link $createTable} is true. */ + private $table = 'log4php_log'; + + /** The instance */ + private $db = null; + + /** boolean used to check if all conditions to append are true */ + private $canAppend = true; + + /** + * Constructor. + * This apender doesn't require a layout. + * @param string $name appender name + */ + function __construct($name) { + parent::__construct($name); + $this->requiresLayout = false; + } + + /** + * Setup db connection. + * Based on defined options, this method connects to db defined in {@link $dsn} + * and creates a {@link $table} table if {@link $createTable} is true. + * @return boolean true if all ok. + * @throws a PDOException if the attempt to connect to the requested database fails. + */ + public function activateOptions() { + if($this->user === null) { + $this->db = new PDO($this->dsn); + } else if($this->password === null) { + $this->db = new PDO($this->dsn, $this->user); + } else { + $this->db = new PDO($this->dsn,$this->user,$this->password); + } + + // test if log table exists + $result = $this->db->query('select * from ' . $this->table . ' where 1 = 0'); + if ($result == false and $this->createTable) { + // TODO mysql syntax? + $query = "CREATE TABLE {$this->table} ( timestamp varchar(32)," . + "logger varchar(32)," . + "level varchar(32)," . + "message varchar(64)," . + "thread varchar(32)," . + "file varchar(64)," . + "line varchar(4) );"; + + $result = $this->db->query($query); + if (!$result) { + $this->canAppend = false; + return; + // TODO throw exception? + } + } + + if($this->sql == '' || $this->sql == null) { + $this->sql = "INSERT INTO $this->table ( timestamp, " . + "logger, " . + "level, " . + "message, " . + "thread, " . + "file, " . + "line" . + ") VALUES ('%d','%c','%p','%m','%t','%F','%L')"; + } + + $this->layout = LoggerReflectionUtils::createObject('LoggerLayoutPattern'); + $this->layout->setConversionPattern($this->sql); + $this->canAppend = true; + return true; + } + + /** + * Appends a new event to the database using the sql format. + */ + // TODO:should work with prepared statement + public function append($event) { + if ($this->canAppend) { + $query = $this->layout->format($event); + $this->db->exec($query); + } + } + + /** + * Closes the connection to the logging database + */ + public function close() { + if ($this->db !== null) { + $db = null; + } + $this->closed = true; + } + + /** + * Indicator if the logging table should be created on startup, + * if its not existing. + */ + public function setCreateTable($flag) { + $this->createTable = LoggerOptionConverter::toBoolean($flag, true); + } + + /** + * Sets the username for this connection. + * Defaults to '' + */ + function setUser($user) { + $this->user = $user; + } + + /** + * Sets the password for this connection. + * Defaults to '' + */ + public function setPassword($password) { + $this->password = $password; + } + + /** + * Sets the SQL string into which the event should be transformed. + * Defaults to: + * + * INSERT INTO $this->table + * ( timestamp, logger, level, message, thread, file, line) + * VALUES + * ('%d','%c','%p','%m','%t','%F','%L') + * + * It's not necessary to change this except you have customized logging' + */ + public function setSql($sql) { + $this->sql = $sql; + } + + /** + * Sets the tablename to which this appender should log. + * Defaults to log4php_log + */ + public function setTable($table) { + $this->table = $table; + } + + /** + * Sets the DSN string for this connection. In case of + * SQLite it could look like this: 'sqlite:appenders/pdotest.sqlite' + */ + public function setDSN($dsn) { + $this->dsn = $dsn; + } + + /** + * Sometimes databases allow only one connection to themselves in one thread. + * SQLite has this behaviour. In that case this handle is needed if the database + * must be checked for events + */ + public function getDatabaseHandle() { + return $this->db; + } +} + diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderPhp.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderPhp.php index 8c82ceb..40c9bcd 100644 --- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderPhp.php +++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderPhp.php @@ -1,13 +1,13 @@ Levels are mapped as follows: @@ -37,34 +28,35 @@ require_once(LOG4PHP_DIR . '/LoggerLog.php'); * - WARN <= level < ERROR mapped to E_USER_WARNING * - level >= ERROR mapped to E_USER_ERROR * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 771547 $ * @package log4php * @subpackage appenders */ -class LoggerAppenderPhp extends LoggerAppenderSkeleton { +class LoggerAppenderPhp extends LoggerAppender { - - public function activateOptions() { - $this->layout = LoggerLayout::factory('LoggerLayoutTTCC'); - $this->closed = false; - } + public function __construct($name) { + parent::__construct($name); + $this->requiresLayout = true; + } + + public function activateOptions() { + $this->closed = false; + } - public function close() { - $this->closed = true; - } + public function close() { + $this->closed = true; + } - public function append($event) { - if ($this->layout !== null) { - LoggerLog::debug("LoggerAppenderPhp::append()"); - $level = $event->getLevel(); - if ($level->isGreaterOrEqual(LoggerLevel::getLevelError())) { - trigger_error($this->layout->format($event), E_USER_ERROR); - } elseif ($level->isGreaterOrEqual(LoggerLevel::getLevelWarn())) { - trigger_error($this->layout->format($event), E_USER_WARNING); - } else { - trigger_error($this->layout->format($event), E_USER_NOTICE); - } - } - } + public function append($event) { + if($this->layout !== null) { + $level = $event->getLevel(); + if($level->isGreaterOrEqual(LoggerLevel::getLevelError())) { + trigger_error($this->layout->format($event), E_USER_ERROR); + } else if ($level->isGreaterOrEqual(LoggerLevel::getLevelWarn())) { + trigger_error($this->layout->format($event), E_USER_WARNING); + } else { + trigger_error($this->layout->format($event), E_USER_NOTICE); + } + } + } } diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderRollingFile.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderRollingFile.php index 011067a..cbff808 100644 --- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderRollingFile.php +++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderRollingFile.php @@ -1,13 +1,13 @@ Contributors: Sergio Strampelli. * - * @author Marco Vassura - * @version $Revision: 640254 $ + * @version $Revision: 771217 $ * @package log4php * @subpackage appenders */ class LoggerAppenderRollingFile extends LoggerAppenderFile { - /** - * Set the maximum size that the output file is allowed to reach - * before being rolled over to backup files. - * - *In configuration files, the MaxFileSize option takes a - * long integer in the range 0 - 2^63. You can specify the value - * with the suffixes "KB", "MB" or "GB" so that the integer is - * interpreted being expressed respectively in kilobytes, megabytes - * or gigabytes. For example, the value "10KB" will be interpreted - * as 10240.
- *The default maximum file size is 10MB.
- * - *Note that MaxFileSize cannot exceed 2 GB.
- * - * @var integer - */ - var $maxFileSize = 10485760; - - /** - * Set the maximum number of backup files to keep around. - * - *The MaxBackupIndex option determines how many backup - * files are kept before the oldest is erased. This option takes - * a positive integer value. If set to zero, then there will be no - * backup files and the log file will be truncated when it reaches - * MaxFileSize.
- *There is one backup file by default.
- * - * @var integer - */ - var $maxBackupIndex = 1; - - /** - * @var string the filename expanded - * @access private - */ - var $expandedFileName = null; + /** + * Set the maximum size that the output file is allowed to reach + * before being rolled over to backup files. + * + *In configuration files, the MaxFileSize option takes a + * long integer in the range 0 - 2^63. You can specify the value + * with the suffixes "KB", "MB" or "GB" so that the integer is + * interpreted being expressed respectively in kilobytes, megabytes + * or gigabytes. For example, the value "10KB" will be interpreted + * as 10240.
+ *The default maximum file size is 10MB.
+ * + *Note that MaxFileSize cannot exceed 2 GB.
+ * + * @var integer + */ + var $maxFileSize = 10485760; + + /** + * Set the maximum number of backup files to keep around. + * + *The MaxBackupIndex option determines how many backup + * files are kept before the oldest is erased. This option takes + * a positive integer value. If set to zero, then there will be no + * backup files and the log file will be truncated when it reaches + * MaxFileSize.
+ *There is one backup file by default.
+ * + * @var integer + */ + var $maxBackupIndex = 1; + + /** + * @var string the filename expanded + * @access private + */ + var $expandedFileName = null; - /** - * Constructor. - * - * @param string $name appender name - */ - public function __construct($name) { - parent::__construct($name); - } - - /** - * Returns the value of the MaxBackupIndex option. - * @return integer - */ - function getExpandedFileName() { - return $this->expandedFileName; - } + /** + * Constructor. + * + * @param string $name appender name + */ + public function __construct($name) { + parent::__construct($name); + } + + /** + * Returns the value of the MaxBackupIndex option. + * @return integer + */ + function getExpandedFileName() { + return $this->expandedFileName; + } - /** - * Returns the value of the MaxBackupIndex option. - * @return integer - */ - function getMaxBackupIndex() { - return $this->maxBackupIndex; - } + /** + * Returns the value of the MaxBackupIndex option. + * @return integer + */ + function getMaxBackupIndex() { + return $this->maxBackupIndex; + } - /** - * Get the maximum size that the output file is allowed to reach - * before being rolled over to backup files. - * @return integer - */ - function getMaximumFileSize() { - return $this->maxFileSize; - } + /** + * Get the maximum size that the output file is allowed to reach + * before being rolled over to backup files. + * @return integer + */ + function getMaximumFileSize() { + return $this->maxFileSize; + } - /** - * Implements the usual roll over behaviour. - * - *If MaxBackupIndex is positive, then files File.1, ..., File.MaxBackupIndex -1 are renamed to File.2, ..., File.MaxBackupIndex. - * Moreover, File is renamed File.1 and closed. A new File is created to receive further log output. - * - *
If MaxBackupIndex is equal to zero, then the File is truncated with no backup files created. - */ - function rollOver() - { - // If maxBackups <= 0, then there is no file renaming to be done. - if($this->maxBackupIndex > 0) { - $fileName = $this->getExpandedFileName(); - // Delete the oldest file, to keep Windows happy. - $file = $fileName . '.' . $this->maxBackupIndex; - if (is_writable($file)) - unlink($file); - // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2} - for ($i = $this->maxBackupIndex - 1; $i >= 1; $i--) { - $file = $fileName . "." . $i; - if (is_readable($file)) { - $target = $fileName . '.' . ($i + 1); - rename($file, $target); - } - } - - // Rename fileName to fileName.1 - $target = $fileName . ".1"; - - $this->closeFile(); // keep windows happy. - - $file = $fileName; - rename($file, $target); - } - - $this->setFile($fileName, false); - unset($this->fp); - $this->activateOptions(); - } - - function setFileName($fileName) - { - $this->fileName = $fileName; - $this->expandedFileName = realpath($fileName); - LoggerLog::debug("LoggerAppenderRollingFile::setFileName():filename=[{$fileName}]:expandedFileName=[{$this->expandedFileName}]"); - } + /** + * Implements the usual roll over behaviour. + * + *
If MaxBackupIndex is positive, then files File.1, ..., File.MaxBackupIndex -1 are renamed to File.2, ..., File.MaxBackupIndex. + * Moreover, File is renamed File.1 and closed. A new File is created to receive further log output. + * + *
If MaxBackupIndex is equal to zero, then the File is truncated with no backup files created. + */ + function rollOver() { + // If maxBackups <= 0, then there is no file renaming to be done. + if($this->maxBackupIndex > 0) { + $fileName = $this->getExpandedFileName(); + // Delete the oldest file, to keep Windows happy. + $file = $fileName . '.' . $this->maxBackupIndex; + if(is_writable($file)) + unlink($file); + // Map {(maxBackupIndex - 1), ..., 2, 1} to {maxBackupIndex, ..., 3, 2} + for($i = $this->maxBackupIndex - 1; $i >= 1; $i--) { + $file = $fileName . "." . $i; + if(is_readable($file)) { + $target = $fileName . '.' . ($i + 1); + rename($file, $target); + } + } + + // Rename fileName to fileName.1 + $target = $fileName . ".1"; + + $this->closeFile(); // keep windows happy. + + $file = $fileName; + rename($file, $target); + } + + unset($this->fp); + $this->activateOptions(); + $this->setFile($fileName, false); + } + + function setFileName($fileName) { + $this->fileName = $fileName; + $this->expandedFileName = realpath($fileName); + } - /** - * Set the maximum number of backup files to keep around. - * - *
The MaxBackupIndex option determines how many backup - * files are kept before the oldest is erased. This option takes - * a positive integer value. If set to zero, then there will be no - * backup files and the log file will be truncated when it reaches - * MaxFileSize. - * - * @param mixed $maxBackups - */ - function setMaxBackupIndex($maxBackups) - { - if (is_numeric($maxBackups)) - $this->maxBackupIndex = abs((int)$maxBackups); - } + /** + * Set the maximum number of backup files to keep around. + * + *
The MaxBackupIndex option determines how many backup + * files are kept before the oldest is erased. This option takes + * a positive integer value. If set to zero, then there will be no + * backup files and the log file will be truncated when it reaches + * MaxFileSize. + * + * @param mixed $maxBackups + */ + function setMaxBackupIndex($maxBackups) { + if(is_numeric($maxBackups)) { + $this->maxBackupIndex = abs((int)$maxBackups); + } + } - /** - * Set the maximum size that the output file is allowed to reach - * before being rolled over to backup files. - * - * @param mixed $maxFileSize - * @see setMaxFileSize() - */ - function setMaximumFileSize($maxFileSize) - { - $this->setMaxFileSize($maxFileSize); - } + /** + * Set the maximum size that the output file is allowed to reach + * before being rolled over to backup files. + * + * @param mixed $maxFileSize + * @see setMaxFileSize() + */ + function setMaximumFileSize($maxFileSize) { + $this->setMaxFileSize($maxFileSize); + } - /** - * Set the maximum size that the output file is allowed to reach - * before being rolled over to backup files. - *
In configuration files, the MaxFileSize option takes an - * long integer in the range 0 - 2^63. You can specify the value - * with the suffixes "KB", "MB" or "GB" so that the integer is - * interpreted being expressed respectively in kilobytes, megabytes - * or gigabytes. For example, the value "10KB" will be interpreted - * as 10240. - * - * @param mixed $value - */ - function setMaxFileSize($value) - { - $maxFileSize = null; - $numpart = substr($value,0, strlen($value) -2); - $suffix = strtoupper(substr($value, -2)); + /** + * Set the maximum size that the output file is allowed to reach + * before being rolled over to backup files. + *
In configuration files, the MaxFileSize option takes an
+ * long integer in the range 0 - 2^63. You can specify the value
+ * with the suffixes "KB", "MB" or "GB" so that the integer is
+ * interpreted being expressed respectively in kilobytes, megabytes
+ * or gigabytes. For example, the value "10KB" will be interpreted
+ * as 10240.
+ *
+ * @param mixed $value
+ */
+ function setMaxFileSize($value) {
+ $maxFileSize = null;
+ $numpart = substr($value,0, strlen($value) -2);
+ $suffix = strtoupper(substr($value, -2));
- switch ($suffix) {
- case 'KB': $maxFileSize = (int)((int)$numpart * 1024); break;
- case 'MB': $maxFileSize = (int)((int)$numpart * 1024 * 1024); break;
- case 'GB': $maxFileSize = (int)((int)$numpart * 1024 * 1024 * 1024); break;
- default:
- if (is_numeric($value)) {
- $maxFileSize = (int)$value;
- }
- }
-
- if ($maxFileSize === null) {
- LoggerLog::debug("LoggerAppenderRollingFile::setMaxFileSize():value=[$value] wrong declaration");
- } else {
- $this->maxFileSize = abs($maxFileSize);
- }
- }
+ switch($suffix) {
+ case 'KB': $maxFileSize = (int)((int)$numpart * 1024); break;
+ case 'MB': $maxFileSize = (int)((int)$numpart * 1024 * 1024); break;
+ case 'GB': $maxFileSize = (int)((int)$numpart * 1024 * 1024 * 1024); break;
+ default:
+ if(is_numeric($value)) {
+ $maxFileSize = (int)$value;
+ }
+ }
+
+ if($maxFileSize === null) {
+ } else {
+ $this->maxFileSize = abs($maxFileSize);
+ }
+ }
- /**
- * @param LoggerLoggingEvent $event
- */
- function append($event)
- {
- if ($this->fp) {
- parent::append($event);
- if (ftell($this->fp) > $this->getMaximumFileSize())
- $this->rollOver();
- }
- }
+ /**
+ * @param LoggerLoggingEvent $event
+ */
+ function append($event) {
+ if($this->fp) {
+ parent::append($event);
+ if(ftell($this->fp) > $this->getMaximumFileSize()) {
+ $this->rollOver();
+ }
+ }
+ }
}
diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSocket.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSocket.php
index 75bb930..6dddeaa 100644
--- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSocket.php
+++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSocket.php
@@ -1,13 +1,13 @@
false.
- */
- var $log4jNamespace = false;
+ /**
+ * @var mixed socket connection resource
+ * @access private
+ */
+ var $sp = false;
+
+ /**
+ * Target host. On how to define remote hostaname see
+ * {@link PHP_MANUAL#fsockopen}
+ * @var string
+ */
+ var $remoteHost = '';
+
+ /**
+ * @var integer the network port.
+ */
+ var $port = 4446;
+
+ /**
+ * @var boolean get event's location info.
+ */
+ var $locationInfo = false;
+
+ /**
+ * @var integer connection timeout
+ */
+ var $timeout = 30;
+
+ /**
+ * @var boolean output events via {@link LoggerXmlLayout}
+ */
+ var $useXml = false;
+
+ /**
+ * @var boolean forward this option to {@link LoggerXmlLayout}.
+ * Ignored if {@link $useXml} is false.
+ */
+ var $log4jNamespace = false;
- /**
- * @var LoggerXmlLayout
- * @access private
- */
- var $xmlLayout = null;
-
- /**
- * Create a socket connection using defined parameters
- */
- public function activateOptions() {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() creating a socket...");
- $errno = 0;
- $errstr = '';
- $this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
- if ($errno) {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket error [$errno] $errstr");
- $this->closed = true;
- } else {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() socket created [".$this->sp."]");
- if ($this->getUseXml()) {
- $this->xmlLayout = LoggerLayout::factory('LoggerXmlLayout');
- if ($this->xmlLayout === null) {
- LoggerLog::debug("LoggerAppenderSocket::activateOptions() useXml is true but layout is null");
- $this->setUseXml(false);
- } else {
- $this->xmlLayout->setLocationInfo($this->getLocationInfo());
- $this->xmlLayout->setLog4jNamespace($this->getLog4jNamespace());
- $this->xmlLayout->activateOptions();
- }
- }
- $this->closed = false;
- }
- }
-
- public function close() {
- fclose($this->sp);
- $this->closed = true;
- }
+ /**
+ * @var LoggerXmlLayout
+ * @access private
+ */
+ var $xmlLayout = null;
+
+ /**
+ * Create a socket connection using defined parameters
+ */
+ public function activateOptions() {
+ $errno = 0;
+ $errstr = '';
+ $this->sp = @fsockopen($this->getRemoteHost(), $this->getPort(), $errno, $errstr, $this->getTimeout());
+ if($errno) {
+ $this->closed = true;
+ } else {
+ if($this->getUseXml()) {
+ $this->xmlLayout = LoggerReflectionUtils::createObject('LoggerXmlLayout');
+ if($this->xmlLayout === null) {
+ $this->setUseXml(false);
+ } else {
+ $this->xmlLayout->setLocationInfo($this->getLocationInfo());
+ $this->xmlLayout->setLog4jNamespace($this->getLog4jNamespace());
+ $this->xmlLayout->activateOptions();
+ }
+ }
+ $this->closed = false;
+ }
+ }
+
+ public function close() {
+ fclose($this->sp);
+ $this->closed = true;
+ }
- /**
- * @return string
- */
- public function getHostname() {
- return $this->getRemoteHost();
- }
-
- /**
- * @return boolean
- */
- public function getLocationInfo() {
- return $this->locationInfo;
- }
-
- /**
- * @return boolean
- */
- public function getLog4jNamespace() {
- return $this->log4jNamespace;
- }
+ /**
+ * @return string
+ */
+ public function getHostname() {
+ return $this->getRemoteHost();
+ }
+
+ /**
+ * @return boolean
+ */
+ public function getLocationInfo() {
+ return $this->locationInfo;
+ }
+
+ /**
+ * @return boolean
+ */
+ public function getLog4jNamespace() {
+ return $this->log4jNamespace;
+ }
- /**
- * @return integer
- */
- public function getPort() {
- return $this->port;
- }
-
- public function getRemoteHost() {
- return $this->remoteHost;
- }
-
- /**
- * @return integer
- */
- public function getTimeout() {
- return $this->timeout;
- }
-
- /**
- * @var boolean
- */
- public function getUseXml() {
- return $this->useXml;
- }
-
- public function reset() {
- $this->close();
- parent::reset();
- }
+ /**
+ * @return integer
+ */
+ public function getPort() {
+ return $this->port;
+ }
+
+ public function getRemoteHost() {
+ return $this->remoteHost;
+ }
+
+ /**
+ * @return integer
+ */
+ public function getTimeout() {
+ return $this->timeout;
+ }
+
+ /**
+ * @var boolean
+ */
+ public function getUseXml() {
+ return $this->useXml;
+ }
+
+ public function reset() {
+ $this->close();
+ parent::reset();
+ }
- /**
- * @param mixed
- */
- public function setLocationInfo($flag) {
- $this->locationInfo = LoggerOptionConverter::toBoolean($flag, $this->getLocationInfo());
- }
+ /**
+ * @param mixed
+ */
+ public function setLocationInfo($flag) {
+ $this->locationInfo = LoggerOptionConverter::toBoolean($flag, $this->getLocationInfo());
+ }
- /**
- * @param mixed
- */
- public function setLog4jNamespace($flag) {
- $this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, $this->getLog4jNamespace());
- }
-
- /**
- * @param integer
- */
- public function setPort($port) {
- $port = LoggerOptionConverter::toInt($port, 0);
- if ($port > 0 and $port < 65535)
- $this->port = $port;
- }
-
- /**
- * @param string
- */
- public function setRemoteHost($hostname) {
- $this->remoteHost = $hostname;
- }
-
- /**
- * @param integer
- */
- public function setTimeout($timeout) {
- $this->timeout = LoggerOptionConverter::toInt($timeout, $this->getTimeout());
- }
-
- /**
- * @param mixed
- */
- public function setUseXml($flag) {
- $this->useXml = LoggerOptionConverter::toBoolean($flag, $this->getUseXml());
- }
+ /**
+ * @param mixed
+ */
+ public function setLog4jNamespace($flag) {
+ $this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, $this->getLog4jNamespace());
+ }
+
+ /**
+ * @param integer
+ */
+ public function setPort($port) {
+ $port = LoggerOptionConverter::toInt($port, 0);
+ if($port > 0 and $port < 65535) {
+ $this->port = $port;
+ }
+ }
+
+ /**
+ * @param string
+ */
+ public function setRemoteHost($hostname) {
+ $this->remoteHost = $hostname;
+ }
+
+ /**
+ * @param integer
+ */
+ public function setTimeout($timeout) {
+ $this->timeout = LoggerOptionConverter::toInt($timeout, $this->getTimeout());
+ }
+
+ /**
+ * @param mixed
+ */
+ public function setUseXml($flag) {
+ $this->useXml = LoggerOptionConverter::toBoolean($flag, $this->getUseXml());
+ }
- /**
- * @param LoggerLoggingEvent
- */
- public function append($event) {
- if ($this->sp) {
-
- LoggerLog::debug("LoggerAppenderSocket::append()");
-
- if ($this->getLocationInfo())
- $event->getLocationInformation();
-
- if (!$this->getUseXml()) {
- $sEvent = serialize($event);
- fwrite($this->sp, $sEvent, strlen($sEvent));
- } else {
- fwrite($this->sp, $this->xmlLayout->format($event));
- }
+ /**
+ * @param LoggerLoggingEvent
+ */
+ public function append($event) {
+ if($this->sp) {
+ if($this->getLocationInfo()) {
+ $event->getLocationInformation();
+ }
+
+ if(!$this->getUseXml()) {
+ $sEvent = serialize($event);
+ fwrite($this->sp, $sEvent, strlen($sEvent));
+ } else {
+ fwrite($this->sp, $this->xmlLayout->format($event));
+ }
- // not sure about it...
- fflush($this->sp);
- }
- }
+ // not sure about it...
+ fflush($this->sp);
+ }
+ }
}
-
diff --git a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSyslog.php b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSyslog.php
index 04d68eb..2513716 100644
--- a/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSyslog.php
+++ b/thirdparty/apache-log4php/src/main/php/appenders/LoggerAppenderSyslog.php
@@ -1,13 +1,13 @@
WARN > level >= INFO to LOG_INFO
* - INFO > level >= DEBUG to LOG_DEBUG
*
- * @author VxR For XML based configuration see {@link LoggerDOMConfigurator}.
+ * For file based configuration see {@link LoggerConfiguratorIni}.
+ * For XML based configuration see {@link LoggerConfiguratorXml}.
*
- * @author Marco Vassura
- * @version $Revision: 635069 $
+ * @version $Revision: 771742 $
* @package log4php
*/
-class LoggerBasicConfigurator implements LoggerConfigurator {
+class LoggerConfiguratorBasic implements LoggerConfigurator {
- /**
- * Add a {@link LoggerAppenderConsole} that uses
- * the {@link LoggerLayoutTTCC} to the root category.
- *
- * @param string $url not used here
- */
- public static function configure($url = null)
- {
- $root = LoggerManager::getRootLogger();
- $appender = new LoggerAppenderConsole('A1');
- $appender->setLayout( new LoggerLayoutTTCC() );
- $root->addAppender($appender);
- }
+ /**
+ * Add a {@link LoggerAppenderConsole} that uses
+ * the {@link LoggerLayoutTTCC} to the root category.
+ *
+ * @param string $url not used here
+ */
+ public static function configure($url = null) {
+ $root = LoggerManager::getRootLogger();
+ $appender = new LoggerAppenderConsole('A1');
+ $appender->setLayout( new LoggerLayoutTTCC() );
+ $root->addAppender($appender);
+ }
- /**
- * Reset the default hierarchy to its default.
- * It is equivalent to
- * The LoggerPropertyConfigurator does not handle the
- * advanced configuration features supported by the {@link LoggerDOMConfigurator}
- * such as support for {@link LoggerFilter},
- custom {@link LoggerErrorHandlers}, nested appenders such as the
- {@link Logger AsyncAppender},
+ * The LoggerConfiguratorIni does not handle the
+ * advanced configuration features supported by the {@link LoggerConfiguratorXml}
+ * such as support for {@link LoggerFilter},
+ custom {@link LoggerErrorHandlers}, nested appenders such as the
+ {@link Logger AsyncAppender},
* etc.
- *
+ *
* All option values admit variable substitution. The
* syntax of variable substitution is similar to that of Unix
* shells. The string between an opening "${" and
@@ -87,7 +71,7 @@ define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME', "root");
* /home/xyz. See {@link LoggerOptionConverter::getSystemProperty()}
* for details. Please note that boolean values should be quoted otherwise the default
+ * Please note that boolean values should be quoted otherwise the default
* value will be chosen. E.g.:
* The function {@link PHP_MANUAL#parse_ini_file} is used to read the
- * file. The configuration file consists of statements in the format
- * key=value. The syntax of different configuration
- * elements are discussed below.
- *
- * Repository-wide threshold The repository-wide threshold filters logging requests by level
- * regardless of logger. The syntax is:
- *
- * The level value can consist of the string values OFF, FATAL,
- * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A
- * custom level value can be specified in the form
- * level#classname. By default the repository-wide threshold is set
- * to the lowest possible value, namely the level ALL.
- * Appender configuration Appender configuration syntax is: Configuring loggers The syntax for configuring the root logger is:
- * This syntax means that an optional level can be
- * supplied followed by appender names separated by commas.
- *
- * The level value can consist of the string values OFF, FATAL,
- * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A
- * custom level value can be specified in the form If a level value is specified, then the root level is set
- * to the corresponding level. If no level value is specified,
- * then the root level remains untouched.
- *
- * The root logger can be assigned multiple appenders.
- *
- * Each appenderName (separated by commas) will be added to
- * the root logger. The named appender is defined using the
- * appender syntax defined above.
- *
- * For non-root categories the syntax is almost the same:
- * The meaning of the optional level value is discussed above
- * in relation to the root logger. In addition however, the value
- * INHERITED can be specified meaning that the named logger should
- * inherit its level from the logger hierarchy. If no level value is supplied, then the level of the
- * named logger remains untouched. By default categories inherit their level from the
- * hierarchy. However, if you set the level of a logger and later
- * decide that that logger should inherit its level, then you should
- * specify INHERITED as the value for the level value. NULL is a
- * synonym for INHERITED. Similar to the root logger syntax, each appenderName
- * (separated by commas) will be attached to the named logger. See the appender additivity rule in the user manual for
- * the meaning of the additivity flag.
- *
- * ObjectRenderers You can customize the way message objects of a given type are
- * converted to String before being logged. This is done by
- * specifying a {@link LoggerObjectRenderer}
- * for the object type would like to customize. The syntax is:
- *
- * Logger Factories Example An example configuration is given below. Other configuration
- * file examples are given in the tests folder.
- *
- * Refer to the setOption method in each Appender and
- * Layout for class specific options. Use the ";" character at the
- * beginning of a line for comments. The function {@link PHP_MANUAL#parse_ini_file} is used to read the
+ * file. The configuration file consists of statements in the format
+ * key=value. The syntax of different configuration
+ * elements are discussed below.
+ *
+ * Repository-wide threshold The repository-wide threshold filters logging requests by level
+ * regardless of logger. The syntax is:
+ *
+ * The level value can consist of the string values OFF, FATAL,
+ * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A
+ * custom level value can be specified in the form
+ * level#classname. By default the repository-wide threshold is set
+ * to the lowest possible value, namely the level ALL.
+ * Appender configuration Appender configuration syntax is: Configuring loggers The syntax for configuring the root logger is:
+ * This syntax means that an optional level can be
+ * supplied followed by appender names separated by commas.
+ *
+ * The level value can consist of the string values OFF, FATAL,
+ * ERROR, WARN, INFO, DEBUG, ALL or a custom level value. A
+ * custom level value can be specified in the form If a level value is specified, then the root level is set
+ * to the corresponding level. If no level value is specified,
+ * then the root level remains untouched.
+ *
+ * The root logger can be assigned multiple appenders.
+ *
+ * Each appenderName (separated by commas) will be added to
+ * the root logger. The named appender is defined using the
+ * appender syntax defined above.
+ *
+ * For non-root categories the syntax is almost the same:
+ * The meaning of the optional level value is discussed above
+ * in relation to the root logger. In addition however, the value
+ * INHERITED can be specified meaning that the named logger should
+ * inherit its level from the logger hierarchy. If no level value is supplied, then the level of the
+ * named logger remains untouched. By default categories inherit their level from the
+ * hierarchy. However, if you set the level of a logger and later
+ * decide that that logger should inherit its level, then you should
+ * specify INHERITED as the value for the level value. NULL is a
+ * synonym for INHERITED. Similar to the root logger syntax, each appenderName
+ * (separated by commas) will be attached to the named logger. See the appender additivity rule in the user manual for
+ * the meaning of the additivity flag.
+ *
+ * ObjectRenderers You can customize the way message objects of a given type are
+ * converted to String before being logged. This is done by
+ * specifying a {@link LoggerRendererObject}
+ * for the object type would like to customize. The syntax is:
+ *
+ * Logger Factories Example An example configuration is given below. Other configuration
+ * file examples are given in the tests folder.
+ *
+ * Refer to the setOption method in each Appender and
+ * Layout for class specific options. Use the ";" character at the
+ * beginning of a line for comments. There are sample XML files included in the package under tests/
* subdirectories.
- * LoggerManager::resetConfiguration();
- *
- *
- * @see LoggerHierarchy::resetConfiguration()
- * @static
- */
- public static function resetConfiguration()
- {
- LoggerManager::resetConfiguration();
- }
+ /**
+ * Reset the default hierarchy to its default.
+ * It is equivalent to
+ *
+ * LoggerManager::resetConfiguration();
+ *
+ *
+ * @see LoggerHierarchy::resetConfiguration()
+ * @static
+ */
+ public static function resetConfiguration() {
+ LoggerManager::resetConfiguration();
+ }
}
diff --git a/thirdparty/apache-log4php/src/main/php/LoggerPropertyConfigurator.php b/thirdparty/apache-log4php/src/main/php/configurators/LoggerConfiguratorIni.php
index 011f23b..440e52f 100644
--- a/thirdparty/apache-log4php/src/main/php/LoggerPropertyConfigurator.php
+++ b/thirdparty/apache-log4php/src/main/php/configurators/LoggerConfiguratorIni.php
@@ -1,13 +1,13 @@
It is sometimes useful to see how log4php is reading configuration
* files. You can enable log4php internal logging by defining the
* log4php.debug variable.
* // Does *not* work. Will always result in default value
@@ -98,576 +82,489 @@ define('LOG4PHP_LOGGER_PROPERTY_CONFIGURATOR_INTERNAL_ROOT_NAME', "root");
*
*
- * log4php.threshold=[level]
- *
- *
- *
- * ; For appender named appenderName, set its class.
- * ; Note: The appender name can contain dots.
- * log4php.appender.appenderName=name_of_appender_class
- *
- * ; Set appender specific options.
- *
- * log4php.appender.appenderName.option1=value1
- * log4php.appender.appenderName.optionN=valueN
- *
- *
- * For each named appender you can configure its {@link LoggerLayout}. The
- * syntax for configuring an appender's layout is:
- *
- * log4php.appender.appenderName.layout=name_of_layout_class
- * log4php.appender.appenderName.layout.option1=value1
- * ....
- * log4php.appender.appenderName.layout.optionN=valueN
- *
- *
- *
- * log4php.rootLogger=[level], appenderName, appenderName, ...
- *
- *
- * level#classname
- *
- *
- * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
- *
- *
- *
- * log4php.renderer.name_of_rendered_class=name_of_rendering.class
- *
- *
- * As in,
- *
- * log4php.renderer.myFruit=myFruitRenderer
- *
- *
- *
- * ; Set options for appender named "A1".
- * ; Appender "A1" will be a LoggerAppenderSyslog
- * log4php.appender.A1=LoggerAppenderSyslog
- *
- * ; The syslog daemon resides on www.abc.net
- * log4php.appender.A1.ident=log4php-test
- *
- * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
- * ; %r %-5p %c{2} %M.%L %x - %m%n. Thus, the log output will
- * ; include the relative time since the start of the application in
- * ; milliseconds, followed by the level of the log request,
- * ; followed by the two rightmost components of the logger name,
- * ; followed by the callers method name, followed by the line number,
- * ; the nested disgnostic context and finally the message itself.
- * ; Refer to the documentation of LoggerPatternLayout} for further information
- * ; on the syntax of the ConversionPattern key.
- * log4php.appender.A1.layout=LoggerPatternLayout
- * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
- *
- * ; Set options for appender named "A2"
- * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
- * ; using at most one backup file. A2's layout is TTCC, using the
- * ; ISO8061 date format with context printing enabled.
- * log4php.appender.A2=LoggerAppenderRollingFile
- * log4php.appender.A2.MaxFileSize=10MB
- * log4php.appender.A2.MaxBackupIndex=1
- * log4php.appender.A2.layout=LoggerLayoutTTCC
- * log4php.appender.A2.layout.ContextPrinting="true"
- * log4php.appender.A2.layout.DateFormat="%c"
- *
- * ; Root logger set to DEBUG using the A2 appender defined above.
- * log4php.rootLogger=DEBUG, A2
- *
- * ; Logger definitions:
- * ; The SECURITY logger inherits is level from root. However, it's output
- * ; will go to A1 appender defined above. It's additivity is non-cumulative.
- * log4php.logger.SECURITY=INHERIT, A1
- * log4php.additivity.SECURITY=false
- *
- * ; Only warnings or above will be logged for the logger "SECURITY.access".
- * ; Output will go to A1.
- * log4php.logger.SECURITY.access=WARN
- *
- *
- * ; The logger "class.of.the.day" inherits its level from the
- * ; logger hierarchy. Output will go to the appender's of the root
- * ; logger, A2 in this case.
- * log4php.logger.class.of.the.day=INHERIT
- *
- *
- *
+ * log4php.threshold=[level]
+ *
+ *
+ *
+ * ; For appender named appenderName, set its class.
+ * ; Note: The appender name can contain dots.
+ * log4php.appender.appenderName=name_of_appender_class
+ *
+ * ; Set appender specific options.
+ *
+ * log4php.appender.appenderName.option1=value1
+ * log4php.appender.appenderName.optionN=valueN
+ *
+ *
+ * For each named appender you can configure its {@link LoggerLayout}. The
+ * syntax for configuring an appender's layout is:
+ *
+ * log4php.appender.appenderName.layout=name_of_layout_class
+ * log4php.appender.appenderName.layout.option1=value1
+ * ....
+ * log4php.appender.appenderName.layout.optionN=valueN
+ *
+ *
+ *
+ * log4php.rootLogger=[level], appenderName, appenderName, ...
+ *
+ *
+ * level#classname
+ *
+ *
+ * log4php.logger.logger_name=[level|INHERITED|NULL], appenderName, appenderName, ...
+ *
+ *
+ *
+ * log4php.renderer.name_of_rendered_class=name_of_rendering.class
+ *
+ *
+ * As in,
+ *
+ * log4php.renderer.myFruit=myFruitRenderer
+ *
+ *
+ *
+ * ; Set options for appender named "A1".
+ * ; Appender "A1" will be a LoggerAppenderSyslog
+ * log4php.appender.A1=LoggerAppenderSyslog
+ *
+ * ; The syslog daemon resides on www.abc.net
+ * log4php.appender.A1.ident=log4php-test
+ *
+ * ; A1's layout is a LoggerPatternLayout, using the conversion pattern
+ * ; %r %-5p %c{2} %M.%L %x - %m%n. Thus, the log output will
+ * ; include the relative time since the start of the application in
+ * ; milliseconds, followed by the level of the log request,
+ * ; followed by the two rightmost components of the logger name,
+ * ; followed by the callers method name, followed by the line number,
+ * ; the nested disgnostic context and finally the message itself.
+ * ; Refer to the documentation of LoggerPatternLayout} for further information
+ * ; on the syntax of the ConversionPattern key.
+ * log4php.appender.A1.layout=LoggerPatternLayout
+ * log4php.appender.A1.layout.ConversionPattern="%-4r %-5p %c{2} %M.%L %x - %m%n"
+ *
+ * ; Set options for appender named "A2"
+ * ; A2 should be a LoggerAppenderRollingFile, with maximum file size of 10 MB
+ * ; using at most one backup file. A2's layout is TTCC, using the
+ * ; ISO8061 date format with context printing enabled.
+ * log4php.appender.A2=LoggerAppenderRollingFile
+ * log4php.appender.A2.MaxFileSize=10MB
+ * log4php.appender.A2.MaxBackupIndex=1
+ * log4php.appender.A2.layout=LoggerLayoutTTCC
+ * log4php.appender.A2.layout.ContextPrinting="true"
+ * log4php.appender.A2.layout.DateFormat="%c"
+ *
+ * ; Root logger set to DEBUG using the A2 appender defined above.
+ * log4php.rootLogger=DEBUG, A2
+ *
+ * ; Logger definitions:
+ * ; The SECURITY logger inherits is level from root. However, it's output
+ * ; will go to A1 appender defined above. It's additivity is non-cumulative.
+ * log4php.logger.SECURITY=INHERIT, A1
+ * log4php.additivity.SECURITY=false
+ *
+ * ; Only warnings or above will be logged for the logger "SECURITY.access".
+ * ; Output will go to A1.
+ * log4php.logger.SECURITY.access=WARN
+ *
+ *
+ * ; The logger "class.of.the.day" inherits its level from the
+ * ; logger hierarchy. Output will go to the appender's of the root
+ * ; logger, A2 in this case.
+ * log4php.logger.class.of.the.day=INHERIT
+ *
+ *
+ *
If the level of the {@link LoggerLoggingEvent} is not between Min and Max - * (inclusive), then {@link LOG4PHP_LOGGER_FILTER_DENY} is returned.
- * + * (inclusive), then {@link LoggerFilter::DENY} is returned. + * *If the Logging event level is within the specified range, then if * AcceptOnMatch is true, - * {@link LOG4PHP_LOGGER_FILTER_ACCEPT} is returned, and if + * {@link LoggerFilter::ACCEPT} is returned, and if * AcceptOnMatch is false, - * {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} is returned.
- * + * {@link LoggerFilter::NEUTRAL} is returned. + * *If LevelMin is not defined, then there is no * minimum acceptable level (i.e. a level is never rejected for * being too "low"/unimportant). If LevelMax is not * defined, then there is no maximum acceptable level (ie a * level is never rejected for being too "high"/important).
* - *Refer to the {@link LoggerAppenderSkeleton::setThreshold()} method - * available to all appenders extending {@link LoggerAppenderSkeleton} + *
Refer to the {@link LoggerAppender::setThreshold()} method + * available to all appenders extending {@link LoggerAppender} * for a more convenient way to filter out events by level.
* * @log4j-class org.apache.log4j.varia.LevelRangeFilter * @log4j-author Simon Kitching * @log4j-author based on code by Ceki Gülcü * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 779006 $ * @package log4php * @subpackage varia * @since 0.6 */ -class LoggerLevelRangeFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; +class LoggerFilterLevelRange extends LoggerFilter { + + /** + * @var boolean + */ + private $acceptOnMatch = true; - /** - * @var LoggerLevel - */ - var $levelMin; + /** + * @var LoggerLevel + */ + private $levelMin; - /** - * @var LoggerLevel - */ - var $levelMax; + /** + * @var LoggerLevel + */ + private $levelMax; - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param boolean $acceptOnMatch - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); - } - - /** - * @return LoggerLevel - */ - function getLevelMin() - { - return $this->levelMin; - } - - /** - * @param string $l the level min to match - */ - function setLevelMin($l) - { - $this->levelMin = LoggerOptionConverter::toLevel($l, null); - } + /** + * @param boolean $acceptOnMatch + */ + public function setAcceptOnMatch($acceptOnMatch) { + $this->acceptOnMatch = LoggerOptionConverter::toBoolean($acceptOnMatch, true); + } + + /** + * @param string $l the level min to match + */ + public function setLevelMin($l) { + if($l instanceof LoggerLevel) { + $this->levelMin = $l; + } else { + $this->levelMin = LoggerOptionConverter::toLevel($l, null); + } + } - /** - * @return LoggerLevel - */ - function getLevelMax() - { - return $this->levelMax; - } - - /** - * @param string $l the level max to match - */ - function setLevelMax($l) - { - $this->levelMax = LoggerOptionConverter::toLevel($l, null); - } + /** + * @param string $l the level max to match + */ + public function setLevelMax($l) { + if($l instanceof LoggerLevel) { + $this->levelMax = $l; + } else { + $this->levelMax = LoggerOptionConverter::toLevel($l, null); + } + } - /** - * Return the decision of this filter. - * - * @param LoggerLoggingEvent $event - * @return integer - */ - function decide($event) - { - $level = $event->getLevel(); - - if($this->levelMin !== null) { - if ($level->isGreaterOrEqual($this->levelMin) == false) { - // level of event is less than minimum - return LOG4PHP_LOGGER_FILTER_DENY; - } - } + /** + * Return the decision of this filter. + * + * @param LoggerLoggingEvent $event + * @return integer + */ + public function decide(LoggerLoggingEvent $event) { + $level = $event->getLevel(); + + if($this->levelMin !== null) { + if($level->isGreaterOrEqual($this->levelMin) == false) { + // level of event is less than minimum + return LoggerFilter::DENY; + } + } - if($this->levelMax !== null) { - if ($level->toInt() > $this->levelMax->toInt()) { - // level of event is greater than maximum - // Alas, there is no Level.isGreater method. and using - // a combo of isGreaterOrEqual && !Equal seems worse than - // checking the int values of the level objects.. - return LOG4PHP_LOGGER_FILTER_DENY; - } - } + if($this->levelMax !== null) { + if($level->toInt() > $this->levelMax->toInt()) { + // level of event is greater than maximum + // Alas, there is no Level.isGreater method. and using + // a combo of isGreaterOrEqual && !Equal seems worse than + // checking the int values of the level objects.. + return LoggerFilter::DENY; + } + } - if ($this->getAcceptOnMatch()) { - // this filter set up to bypass later filters and always return - // accept if level in range - return LOG4PHP_LOGGER_FILTER_ACCEPT; - } else { - // event is ok for this filter; allow later filters to have a look.. - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } - } + if($this->acceptOnMatch) { + // this filter set up to bypass later filters and always return + // accept if level in range + return LoggerFilter::ACCEPT; + } else { + // event is ok for this filter; allow later filters to have a look.. + return LoggerFilter::NEUTRAL; + } + } } diff --git a/thirdparty/apache-log4php/src/main/php/varia/LoggerStringMatchFilter.php b/thirdparty/apache-log4php/src/main/php/filters/LoggerFilterStringMatch.php index 80c5b58..464c0c1 100644 --- a/thirdparty/apache-log4php/src/main/php/varia/LoggerStringMatchFilter.php +++ b/thirdparty/apache-log4php/src/main/php/filters/LoggerFilterStringMatch.php @@ -1,13 +1,13 @@ AcceptOnMatch option value is true, if it is false then - * {@link LOG4PHP_LOGGER_FILTER_DENY} is returned. If there is no match, {@link LOG4PHP_LOGGER_FILTER_NEUTRAL} + * {@link LoggerFilter::DENY} is returned. If there is no match, {@link LoggerFilter::NEUTRAL} * is returned. * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 779002 $ * @package log4php * @subpackage varia * @since 0.3 */ -class LoggerStringMatchFilter extends LoggerFilter { - - /** - * @var boolean - */ - var $acceptOnMatch = true; +class LoggerFilterStringMatch extends LoggerFilter { + + /** + * @var boolean + */ + private $acceptOnMatch = true; + + /** + * @var string + */ + private $stringToMatch = null; - /** - * @var string - */ - var $stringToMatch = null; - - /** - * @return boolean - */ - function getAcceptOnMatch() - { - return $this->acceptOnMatch; - } - - /** - * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false') - */ - function setAcceptOnMatch($acceptOnMatch) - { - $this->acceptOnMatch = is_bool($acceptOnMatch) ? - $acceptOnMatch : - (bool)(strtolower($acceptOnMatch) == 'true'); - } - - /** - * @return string - */ - function getStringToMatch() - { - return $this->stringToMatch; - } - - /** - * @param string $s the string to match - */ - function setStringToMatch($s) - { - $this->stringToMatch = $s; - } + /** + * @param mixed $acceptOnMatch a boolean or a string ('true' or 'false') + */ + public function setAcceptOnMatch($acceptOnMatch) { + $this->acceptOnMatch = is_bool($acceptOnMatch) ? $acceptOnMatch : (bool)(strtolower($acceptOnMatch) == 'true'); + } + + /** + * @param string $s the string to match + */ + public function setStringToMatch($s) { + $this->stringToMatch = $s; + } - /** - * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match. - */ - function decide($event) - { - $msg = $event->getRenderedMessage(); - - if($msg === null or $this->stringToMatch === null) - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - if( strpos($msg, $this->stringToMatch) !== false ) { - return ($this->acceptOnMatch) ? LOG4PHP_LOGGER_FILTER_ACCEPT : LOG4PHP_LOGGER_FILTER_DENY ; - } - return LOG4PHP_LOGGER_FILTER_NEUTRAL; - } + /** + * @return integer a {@link LOGGER_FILTER_NEUTRAL} is there is no string match. + */ + public function decide(LoggerLoggingEvent $event) { + $msg = $event->getRenderedMessage(); + + if($msg === null or $this->stringToMatch === null) { + return LoggerFilter::NEUTRAL; + } + + if(strpos($msg, $this->stringToMatch) !== false ) { + return ($this->acceptOnMatch) ? LoggerFilter::ACCEPT : LoggerFilter::DENY; + } + return LoggerFilter::NEUTRAL; + } } diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerBasicPatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerBasicPatternConverter.php new file mode 100644 index 0000000..2dd152a --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerBasicPatternConverter.php @@ -0,0 +1,73 @@ +LoggerPatternConverter($formattingInfo); + $this->type = $type; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) { + switch($this->type) { + case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER: + $timeStamp = $event->getTimeStamp(); + $startTime = LoggerLoggingEvent::getStartTime(); + return (string)(int)($timeStamp * 1000 - $startTime * 1000); + + case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER: + return $event->getThreadName(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER: + $level = $event->getLevel(); + return $level->toString(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER: + return $event->getNDC(); + + case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER: + return $event->getRenderedMessage(); + + default: + return ''; + } + } +} diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerCategoryPatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerCategoryPatternConverter.php new file mode 100644 index 0000000..c1f2178 --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerCategoryPatternConverter.php @@ -0,0 +1,46 @@ +LoggerNamedPatternConverter($formattingInfo, $precision); + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function getFullyQualifiedName($event) { + return $event->getLoggerName(); + } +} diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerClassNamePatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerClassNamePatternConverter.php new file mode 100644 index 0000000..03cab0f --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerClassNamePatternConverter.php @@ -0,0 +1,47 @@ +LoggerNamedPatternConverter($formattingInfo, $precision); + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function getFullyQualifiedName($event) { + return $event->fqcn; + } +} + diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerDatePatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerDatePatternConverter.php new file mode 100644 index 0000000..228ce0f --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerDatePatternConverter.php @@ -0,0 +1,55 @@ +LoggerPatternConverter($formattingInfo); + $this->df = $df; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) { + $timeStamp = $event->getTimeStamp(); + $usecs = round(($timeStamp - (int)$timeStamp) * 1000); + $this->df = preg_replace('/((?df); + return date($this->df, $event->getTimeStamp()); + } +} diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerFormattingInfo.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerFormattingInfo.php index 70a7f52..e0436ea 100644 --- a/thirdparty/apache-log4php/src/main/php/helpers/LoggerFormattingInfo.php +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerFormattingInfo.php @@ -1,13 +1,13 @@ min = -1; - $this->max = 0x7FFFFFFF; - $this->leftAlign = false; - } + /** + * Constructor + */ + function LoggerFormattingInfo() {} + + function reset() { + $this->min = -1; + $this->max = 0x7FFFFFFF; + $this->leftAlign = false; + } - function dump() - { - LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}"); - } -} + function dump() { + // TODO: other option to dump? + // LoggerLog::debug("LoggerFormattingInfo::dump() min={$this->min}, max={$this->max}, leftAlign={$this->leftAlign}"); + } +} diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerLiteralPatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerLiteralPatternConverter.php new file mode 100644 index 0000000..6a979dd --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerLiteralPatternConverter.php @@ -0,0 +1,59 @@ +literal = $value; + } + + /** + * @param string &$sbuf + * @param LoggerLoggingEvent $event + */ + function format(&$sbuf, $event) { + $sbuf .= $this->literal; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) { + return $this->literal; + } +} + diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerLocationPatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerLocationPatternConverter.php new file mode 100644 index 0000000..01e474d --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerLocationPatternConverter.php @@ -0,0 +1,65 @@ +LoggerPatternConverter($formattingInfo); + $this->type = $type; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) { + $locationInfo = $event->getLocationInformation(); + switch($this->type) { + case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER: + return $locationInfo->getFullInfo(); + case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER: + return $locationInfo->getMethodName(); + case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER: + return $locationInfo->getLineNumber(); + case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER: + return $locationInfo->getFileName(); + default: + return ''; + } + } +} + diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerMDCPatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerMDCPatternConverter.php new file mode 100644 index 0000000..03eada6 --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerMDCPatternConverter.php @@ -0,0 +1,52 @@ +LoggerPatternConverter($formattingInfo); + $this->key = $key; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) { + return $event->getMDC($this->key); + } +} diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerNamedPatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerNamedPatternConverter.php new file mode 100644 index 0000000..05abb68 --- /dev/null +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerNamedPatternConverter.php @@ -0,0 +1,79 @@ +LoggerPatternConverter($formattingInfo); + $this->precision = $precision; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + * @abstract + */ + function getFullyQualifiedName($event) { + // abstract + return; + } + + /** + * @param LoggerLoggingEvent $event + * @return string + */ + function convert($event) { + $n = $this->getFullyQualifiedName($event); + if($this->precision <= 0) { + return $n; + } else { + $len = strlen($n); + // We substract 1 from 'len' when assigning to 'end' to avoid out of + // bounds exception in return r.substring(end+1, len). This can happen if + // precision is 1 and the category name ends with a dot. + $end = $len -1 ; + for($i = $this->precision; $i > 0; $i--) { + $end = strrpos(substr($n, 0, ($end - 1)), '.'); + if($end == false) { + return $n; + } + } + return substr($n, ($end + 1), $len); + } + } +} diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerOptionConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerOptionConverter.php index a26dd83..773dc1c 100644 --- a/thirdparty/apache-log4php/src/main/php/helpers/LoggerOptionConverter.php +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerOptionConverter.php @@ -1,13 +1,13 @@ $key using this search criteria: - * - if $key is a constant then return it. Else - * - if $key is set in $_ENV then return it. Else - * - return $def. - * - * @param string $key The key to search for. - * @param string $def The default value to return. - * @return string the string value of the system property, or the default - * value if there is no property with that key. - * - * @static - */ - public static function getSystemProperty($key, $def) - { - LoggerLog::debug("LoggerOptionConverter::getSystemProperty():key=[{$key}]:def=[{$def}]."); - - if (defined($key)) { - return (string)constant($key); - } elseif (isset($_ENV[$key])) { - return (string)$_ENV[$key]; - } else { - return $def; - } - } - - /** - * If $value is true, then true is - * returned. If $value is false, then - * true is returned. Otherwise, $default is - * returned. - * - *Case of value is unimportant.
- * - * @param string $value - * @param boolean $default - * @return boolean - * - * @static - */ - public static function toBoolean($value, $default) - { - if($value === null) - return $default; - if ($value == 1) - return true; - $trimmedVal = strtolower(trim($value)); - if ("true" == $trimmedVal or "yes" == $trimmedVal) - return true; - if ("false" == $trimmedVal) - return false; - return $default; - } - - /** - * @param string $value - * @param integer $default - * @return integer - * @static - */ - public static function toInt($value, $default) - { - $value = trim($value); - if (is_numeric($value)) { - return (int)$value; - } else { - return $default; - } - } + const DELIM_START = '${'; + const DELIM_STOP = '}'; + const DELIM_START_LEN = 2; + const DELIM_STOP_LEN = 1; - /** - * Converts a standard or custom priority level to a Level - * object. - * - *If $value is of form "level#full_file_classname", - * where full_file_classname means the class filename with path - * but without php extension, then the specified class' toLevel() method - * is called to process the specified level string; if no '#' - * character is present, then the default {@link LoggerLevel} - * class is used to process the level value.
- * - *As a special case, if the $value parameter is - * equal to the string "NULL", then the value null will - * be returned.
- * - *If any error occurs while converting the value to a level, - * the $defaultValue parameter, which may be - * null, is returned.
- * - *Case of $value is insignificant for the level level, but is - * significant for the class name part, if present.
- * - * @param string $value - * @param LoggerLevel $defaultValue - * @return LoggerLevel a {@link LoggerLevel} or null - * @static - */ - public static function toLevel($value, $defaultValue) - { - if($value === null) - return $defaultValue; + /** + * Read a predefined var. + * + * It returns a value referenced by $key using this search criteria: + * - if $key is a constant then return it. Else + * - if $key is set in $_ENV then return it. Else + * - return $def. + * + * @param string $key The key to search for. + * @param string $def The default value to return. + * @return string the string value of the system property, or the default + * value if there is no property with that key. + * + * @static + */ + public static function getSystemProperty($key, $def) { + if(defined($key)) { + return (string)constant($key); + } else if(isset($_SERVER[$key])) { + return (string)$_SERVER[$key]; + } else if(isset($_ENV[$key])) { + return (string)$_ENV[$key]; + } else { + return $def; + } + } - $hashIndex = strpos($value, '#'); - if ($hashIndex === false) { - if("NULL" == strtoupper($value)) { - return null; - } else { - // no class name specified : use standard Level class - return LoggerLevel::toLevel($value, $defaultValue); - } - } + /** + * If $value is true, then true is + * returned. If $value is false, then + * true is returned. Otherwise, $default is + * returned. + * + *Case of value is unimportant.
+ * + * @param string $value + * @param boolean $default + * @return boolean + * + * @static + */ + public static function toBoolean($value, $default) { + if($value === null) { + return $default; + } + if($value == 1) { + return true; + } + $trimmedVal = strtolower(trim($value)); + if("true" == $trimmedVal or "yes" == $trimmedVal) { + return true; + } + if("false" == $trimmedVal) { + return false; + } + return $default; + } - $result = $defaultValue; + /** + * @param string $value + * @param integer $default + * @return integer + * @static + */ + public static function toInt($value, $default) { + $value = trim($value); + if(is_numeric($value)) { + return (int)$value; + } else { + return $default; + } + } - $clazz = substr($value, ($hashIndex + 1)); - $levelName = substr($value, 0, $hashIndex); + /** + * Converts a standard or custom priority level to a Level + * object. + * + *If $value is of form "level#full_file_classname", + * where full_file_classname means the class filename with path + * but without php extension, then the specified class' toLevel() method + * is called to process the specified level string; if no '#' + * character is present, then the default {@link LoggerLevel} + * class is used to process the level value.
+ * + *As a special case, if the $value parameter is + * equal to the string "NULL", then the value null will + * be returned.
+ * + *If any error occurs while converting the value to a level, + * the $defaultValue parameter, which may be + * null, is returned.
+ * + *Case of $value is insignificant for the level level, but is + * significant for the class name part, if present.
+ * + * @param string $value + * @param LoggerLevel $defaultValue + * @return LoggerLevel a {@link LoggerLevel} or null + * @static + */ + public static function toLevel($value, $defaultValue) { + if($value === null) { + return $defaultValue; + } + $hashIndex = strpos($value, '#'); + if($hashIndex === false) { + if("NULL" == strtoupper($value)) { + return null; + } else { + // no class name specified : use standard Level class + return LoggerLevel::toLevel($value, $defaultValue); + } + } - // This is degenerate case but you never know. - if("NULL" == strtoupper($levelName)) { - return null; - } + $result = $defaultValue; - LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}]:pri=[{$levelName}]"); + $clazz = substr($value, ($hashIndex + 1)); + $levelName = substr($value, 0, $hashIndex); - if (!class_exists($clazz)) - @include_once("{$clazz}.php"); + // This is degenerate case but you never know. + if("NULL" == strtoupper($levelName)) { + return null; + } - $clazz = basename($clazz); + $clazz = basename($clazz); - if (class_exists($clazz)) { - $result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue); - if (!is_a($result, 'loggerlevel')) { - LoggerLog::debug("LoggerOptionConverter::toLevel():class=[{$clazz}] cannot call toLevel(). Returning default."); - $result = $defaultValue; - } - } else { - LoggerLog::warn("LoggerOptionConverter::toLevel() class '{$clazz}' doesnt exists."); - } - return $result; - } + if(class_exists($clazz)) { + $result = @call_user_func(array($clazz, 'toLevel'), $levelName, $defaultValue); + if(!$result instanceof LoggerLevel) { + $result = $defaultValue; + } + } + return $result; + } - /** - * @param string $value - * @param float $default - * @return float - * - * @static - */ - public static function toFileSize($value, $default) - { - if ($value === null) - return $default; + /** + * @param string $value + * @param float $default + * @return float + * + * @static + */ + public static function toFileSize($value, $default) { + if($value === null) { + return $default; + } - $s = strtoupper(trim($value)); - $multiplier = (float)1; - if(($index = strpos($s, 'KB')) !== false) { - $multiplier = 1024; - $s = substr($s, 0, $index); - } elseif(($index = strpos($s, 'MB')) !== false) { - $multiplier = 1024 * 1024; - $s = substr($s, 0, $index); - } elseif(($index = strpos($s, 'GB')) !== false) { - $multiplier = 1024 * 1024 * 1024; - $s = substr($s, 0, $index); - } - if(is_numeric($s)) { - return (float)$s * $multiplier; - } else { - LoggerLog::warn("LoggerOptionConverter::toFileSize() [{$s}] is not in proper form."); - } - return $default; - } + $s = strtoupper(trim($value)); + $multiplier = (float)1; + if(($index = strpos($s, 'KB')) !== false) { + $multiplier = 1024; + $s = substr($s, 0, $index); + } else if(($index = strpos($s, 'MB')) !== false) { + $multiplier = 1024 * 1024; + $s = substr($s, 0, $index); + } else if(($index = strpos($s, 'GB')) !== false) { + $multiplier = 1024 * 1024 * 1024; + $s = substr($s, 0, $index); + } + if(is_numeric($s)) { + return (float)$s * $multiplier; + } + return $default; + } - /** - * Find the value corresponding to $key in - * $props. Then perform variable substitution on the - * found value. - * - * @param string $key - * @param array $props - * @return string - * - * @static - */ - public static function findAndSubst($key, $props) - { - $value = @$props[$key]; - if(empty($value)) { - return null; - } - return LoggerOptionConverter::substVars($value, $props); - } + /** + * Find the value corresponding to $key in + * $props. Then perform variable substitution on the + * found value. + * + * @param string $key + * @param array $props + * @return string + * + * @static + */ + public static function findAndSubst($key, $props) { + $value = @$props[$key]; + if(!empty($value)) { + return LoggerOptionConverter::substVars($value, $props); + } + } - /** - * Perform variable substitution in string $val from the - * values of keys found with the {@link getSystemProperty()} method. - * - *The variable substitution delimeters are ${ and }. - * - *
For example, if the "MY_CONSTANT" contains "value", then
- * the call
- *
- * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}.");
- *
- * will set the variable $s to "Value of key is value.".
If no value could be found for the specified key, then the - * $props parameter is searched, if the value could not - * be found there, then substitution defaults to the empty string.
- * - *For example, if {@link getSystemProperty()} cannot find any value for the key
- * "inexistentKey", then the call
- *
- * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
- *
- * will set $s to "Value of inexistentKey is []".
A warn is thrown if $val contains a start delimeter "${" - * which is not balanced by a stop delimeter "}" and an empty string is returned.
- * - * @log4j-author Avy Sharell - * - * @param string $val The string on which variable substitution is performed. - * @param array $props - * @return string - * - * @static - */ - public static function substVars($val, $props = null) - { - LoggerLog::debug("LoggerOptionConverter::substVars():val=[{$val}]"); - - $sbuf = ''; - $i = 0; - while(true) { - $j = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_START, $i); - if ($j === false) { - LoggerLog::debug("LoggerOptionConverter::substVars() no more variables"); - // no more variables - if ($i == 0) { // this is a simple string - LoggerLog::debug("LoggerOptionConverter::substVars() simple string"); - return $val; - } else { // add the tail string which contails no variables and return the result. - $sbuf .= substr($val, $i); - LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]. Returning sbuf"); - return $sbuf; - } - } else { - - $sbuf .= substr($val, $i, $j-$i); - LoggerLog::debug("LoggerOptionConverter::substVars():sbuf=[{$sbuf}]:i={$i}:j={$j}."); - $k = strpos($val, LOG4PHP_OPTION_CONVERTER_DELIM_STOP, $j); - if ($k === false) { - LoggerLog::warn( - "LoggerOptionConverter::substVars() " . - "'{$val}' has no closing brace. Opening brace at position {$j}." - ); - return ''; - } else { - $j += LOG4PHP_OPTION_CONVERTER_DELIM_START_LEN; - $key = substr($val, $j, $k - $j); - // first try in System properties - $replacement = LoggerOptionConverter::getSystemProperty($key, null); - // then try props parameter - if($replacement == null and $props !== null) { - $replacement = @$props[$key]; - } + /** + * Perform variable substitution in string $val from the + * values of keys found with the {@link getSystemProperty()} method. + * + *The variable substitution delimeters are ${ and }. + * + *
For example, if the "MY_CONSTANT" contains "value", then
+ * the call
+ *
+ * $s = LoggerOptionConverter::substituteVars("Value of key is ${MY_CONSTANT}.");
+ *
+ * will set the variable $s to "Value of key is value.".
If no value could be found for the specified key, then the + * $props parameter is searched, if the value could not + * be found there, then substitution defaults to the empty string.
+ * + *For example, if {@link getSystemProperty()} cannot find any value for the key
+ * "inexistentKey", then the call
+ *
+ * $s = LoggerOptionConverter::substVars("Value of inexistentKey is [${inexistentKey}]");
+ *
+ * will set $s to "Value of inexistentKey is []".
A warn is thrown if $val contains a start delimeter "${" + * which is not balanced by a stop delimeter "}" and an empty string is returned.
+ * + * @log4j-author Avy Sharell + * + * @param string $val The string on which variable substitution is performed. + * @param array $props + * @return string + * + * @static + */ + // TODO: this method doesn't work correctly with key = true, it needs key = "true" which is odd + public static function substVars($val, $props = null) { + $sbuf = ''; + $i = 0; + while(true) { + $j = strpos($val, self::DELIM_START, $i); + if($j === false) { + // no more variables + if($i == 0) { // this is a simple string + return $val; + } else { // add the tail string which contails no variables and return the result. + $sbuf .= substr($val, $i); + return $sbuf; + } + } else { + + $sbuf .= substr($val, $i, $j-$i); + $k = strpos($val, self::DELIM_STOP, $j); + if($k === false) { + // LoggerOptionConverter::substVars() has no closing brace. Opening brace + return ''; + } else { + $j += self::START_LEN; + $key = substr($val, $j, $k - $j); + // first try in System properties + $replacement = LoggerOptionConverter::getSystemProperty($key, null); + // then try props parameter + if($replacement == null and $props !== null) { + $replacement = @$props[$key]; + } - if(!empty($replacement)) { - // Do variable substitution on the replacement string - // such that we can solve "Hello ${x2}" as "Hello p1" - // the where the properties are - // x1=p1 - // x2=${x1} - $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props); - $sbuf .= $recursiveReplacement; - } - $i = $k + LOG4PHP_OPTION_CONVERTER_DELIM_STOP_LEN; - } - } - } - } + if(!empty($replacement)) { + // Do variable substitution on the replacement string + // such that we can solve "Hello ${x2}" as "Hello p1" + // the where the properties are + // x1=p1 + // x2=${x1} + $recursiveReplacement = LoggerOptionConverter::substVars($replacement, $props); + $sbuf .= $recursiveReplacement; + } + $i = $k + self::DELIM_STOP_LEN; + } + } + } + } } diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternConverter.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternConverter.php index a163c94..465bd1d 100644 --- a/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternConverter.php +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternConverter.php @@ -1,13 +1,13 @@ * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 778046 $ * @package log4php * @subpackage helpers * @abstract @@ -54,453 +49,89 @@ $GLOBALS['log4php.LoggerPatternConverter.spaces'] = array(" ", " ", " ", " */ class LoggerPatternConverter { - /** - * @var LoggerPatternConverter next converter in converter chain - */ - var $next = null; - - var $min = -1; - var $max = 0x7FFFFFFF; - var $leftAlign = false; - - /** - * Constructor - * - * @param LoggerFormattingInfo $fi - */ - function LoggerPatternConverter($fi = null) - { - if ($fi !== null) { - $this->min = $fi->min; - $this->max = $fi->max; - $this->leftAlign = $fi->leftAlign; - } - } + /** + * @var LoggerPatternConverter next converter in converter chain + */ + var $next = null; + + var $min = -1; + var $max = 0x7FFFFFFF; + var $leftAlign = false; + + /** + * Constructor + * + * @param LoggerFormattingInfo $fi + */ + function LoggerPatternConverter($fi = null) { + if($fi !== null) { + $this->min = $fi->min; + $this->max = $fi->max; + $this->leftAlign = $fi->leftAlign; + } + } - /** - * Derived pattern converters must override this method in order to - * convert conversion specifiers in the correct way. - * - * @param LoggerLoggingEvent $event - */ - function convert($event) {} - - /** - * A template method for formatting in a converter specific way. - * - * @param string &$sbuf string buffer - * @param LoggerLoggingEvent $e - */ - function format(&$sbuf, $e) - { - LoggerLog::debug("LoggerPatternConverter::format() sbuf='$sbuf'"); - - $s = $this->convert($e); - - LoggerLog::debug("LoggerPatternConverter::format() converted event is '$s'"); - - - if($s == null or empty($s)) { - if(0 < $this->min) - $this->spacePad($sbuf, $this->min); - return; - } - - $len = strlen($s); - - if($len > $this->max) { - $sbuf .= substr($s , 0, ($len - $this->max)); - } elseif($len < $this->min) { - if($this->leftAlign) { - $sbuf .= $s; - $this->spacePad($sbuf, ($this->min - $len)); - } else { - $this->spacePad($sbuf, ($this->min - $len)); - $sbuf .= $s; - } - } else { - $sbuf .= $s; - } - } - - - /** - * Fast space padding method. - * - * @param string &$sbuf string buffer - * @param integer $length pad length - * - * @todo reimplement using PHP string functions - */ - function spacePad(&$sbuf, $length) - { - LoggerLog::debug("LoggerPatternConverter::spacePad() sbuf='$sbuf' len='$length'"); - - while($length >= 32) { - $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5]; - $length -= 32; - } - - for($i = 4; $i >= 0; $i--) { - if(($length & (1<<$i)) != 0) { - $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i]; - } - } - - // $sbuf = str_pad($sbuf, $length); - } -} - -// --------------------------------------------------------------------- -// PatternConverters -// --------------------------------------------------------------------- - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - */ -class LoggerBasicPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $type; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $type - */ - function LoggerBasicPatternConverter($formattingInfo, $type) - { - LoggerLog::debug("LoggerBasicPatternConverter::LoggerBasicPatternConverter() type='$type'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->type = $type; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - switch($this->type) { - case LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER: - $timeStamp = $event->getTimeStamp(); - $startTime = LoggerLoggingEvent::getStartTime(); - return (string)(int)($timeStamp * 1000 - $startTime * 1000); - - case LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER: - return $event->getThreadName(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER: - $level = $event->getLevel(); - return $level->toString(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER: - return $event->getNDC(); - - case LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER: - return $event->getRenderedMessage(); - - default: - return ''; - } - } -} - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - */ -class LoggerLiteralPatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $literal; - - /** - * Constructor - * - * @param string $value - */ - function LoggerLiteralPatternConverter($value) - { - LoggerLog::debug("LoggerLiteralPatternConverter::LoggerLiteralPatternConverter() value='$value'"); - - $this->literal = $value; - } - - /** - * @param string &$sbuf - * @param LoggerLoggingEvent $event - */ - function format(&$sbuf, $event) - { - $sbuf .= $this->literal; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - return $this->literal; - } -} - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - */ -class LoggerDatePatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $df; - - /** - * Constructor - * - * @param string $formattingInfo - * @param string $df - */ - function LoggerDatePatternConverter($formattingInfo, $df) - { - LoggerLog::debug("LoggerDatePatternConverter::LoggerDatePatternConverter() dateFormat='$df'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->df = $df; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $timeStamp = $event->getTimeStamp(); - $usecs = round(($timeStamp - (int)$timeStamp) * 1000); - $this->df = str_replace("\u", "u", ereg_replace("[^\\]u", sprintf(',%03d', $usecs), $this->df)); - - return date($this->df, $event->getTimeStamp()); - - } -} - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - */ -class LoggerMDCPatternConverter extends LoggerPatternConverter { - - /** - * @var string - */ - var $key; - - /** - * Constructor - * - * @param string $formattingInfo - * @param string $key - */ - function LoggerMDCPatternConverter($formattingInfo, $key) - { - LoggerLog::debug("LoggerMDCPatternConverter::LoggerMDCPatternConverter() key='$key'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->key = $key; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - return $event->getMDC($this->key); - } -} - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - */ -class LoggerLocationPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $type; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $type - */ - function LoggerLocationPatternConverter($formattingInfo, $type) - { - LoggerLog::debug("LoggerLocationPatternConverter::LoggerLocationPatternConverter() type='$type'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->type = $type; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $locationInfo = $event->getLocationInformation(); - switch($this->type) { - case LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER: - return $locationInfo->fullInfo; - case LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER: - return $locationInfo->getMethodName(); - case LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER: - return $locationInfo->getLineNumber(); - case LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER: - return $locationInfo->getFileName(); - default: - return ''; - } - } -} - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - * @abstract - */ -class LoggerNamedPatternConverter extends LoggerPatternConverter { - - /** - * @var integer - */ - var $precision; - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerNamedPatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerNamedPatternConverter::LoggerNamedPatternConverter() precision='$precision'"); - - $this->LoggerPatternConverter($formattingInfo); - $this->precision = $precision; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - * @abstract - */ - function getFullyQualifiedName($event) - { - // abstract - return; - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function convert($event) - { - $n = $this->getFullyQualifiedName($event); - if ($this->precision <= 0) { - return $n; - } else { - $len = strlen($n); - - // We substract 1 from 'len' when assigning to 'end' to avoid out of - // bounds exception in return r.substring(end+1, len). This can happen if - // precision is 1 and the category name ends with a dot. - $end = $len -1 ; - for($i = $this->precision; $i > 0; $i--) { - $end = strrpos(substr($n, 0, ($end - 1)), '.'); - if ($end == false) - return $n; - } - return substr($n, ($end + 1), $len); - } - } -} - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - */ -class LoggerClassNamePatternConverter extends LoggerNamedPatternConverter { - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerClassNamePatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerClassNamePatternConverter::LoggerClassNamePatternConverter() precision='$precision'"); - - $this->LoggerNamedPatternConverter($formattingInfo, $precision); - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function getFullyQualifiedName($event) - { - return $event->fqcn; - } + /** + * Derived pattern converters must override this method in order to + * convert conversion specifiers in the correct way. + * + * @param LoggerLoggingEvent $event + */ + function convert($event) {} + + /** + * A template method for formatting in a converter specific way. + * + * @param string &$sbuf string buffer + * @param LoggerLoggingEvent $e + */ + function format(&$sbuf, $e) { + $s = $this->convert($e); + + if($s == null or empty($s)) { + if(0 < $this->min) { + $this->spacePad($sbuf, $this->min); + } + return; + } + + $len = strlen($s); + + if($len > $this->max) { + $sbuf .= substr($s , 0, ($len - $this->max)); + } else if($len < $this->min) { + if($this->leftAlign) { + $sbuf .= $s; + $this->spacePad($sbuf, ($this->min - $len)); + } else { + $this->spacePad($sbuf, ($this->min - $len)); + $sbuf .= $s; + } + } else { + $sbuf .= $s; + } + } + + /** + * Fast space padding method. + * + * @param string &$sbuf string buffer + * @param integer $length pad length + * + * @todo reimplement using PHP string functions + */ + function spacePad(&$sbuf, $length) { + while($length >= 32) { + $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][5]; + $length -= 32; + } + + for($i = 4; $i >= 0; $i--) { + if(($length & (1<<$i)) != 0) { + $sbuf .= $GLOBALS['log4php.LoggerPatternConverter.spaces'][$i]; + } + } + + // $sbuf = str_pad($sbuf, $length); + } } - -/** - * @author Marco Vassura - * @package log4php - * @subpackage helpers - */ -class LoggerCategoryPatternConverter extends LoggerNamedPatternConverter { - - /** - * Constructor - * - * @param string $formattingInfo - * @param integer $precision - */ - function LoggerCategoryPatternConverter($formattingInfo, $precision) - { - LoggerLog::debug("LoggerCategoryPatternConverter::LoggerCategoryPatternConverter() precision='$precision'"); - - $this->LoggerNamedPatternConverter($formattingInfo, $precision); - } - - /** - * @param LoggerLoggingEvent $event - * @return string - */ - function getFullyQualifiedName($event) - { - return $event->getLoggerName(); - } -} - diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternParser.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternParser.php index fd69105..ff2429d 100644 --- a/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternParser.php +++ b/thirdparty/apache-log4php/src/main/php/helpers/LoggerPatternParser.php @@ -1,13 +1,13 @@ It is this class that parses conversion patterns and creates * a chained list of {@link LoggerPatternConverter} converters. * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 771204 $ * @package log4php * @subpackage helpers * @@ -86,323 +60,288 @@ define('LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE', 'd M Y H:i:s,u'); */ class LoggerPatternParser { - var $state; - var $currentLiteral; - var $patternLength; - var $i; - - /** - * @var LoggerPatternConverter - */ - var $head = null; - - /** - * @var LoggerPatternConverter - */ - var $tail = null; - - /** - * @var LoggerFormattingInfo - */ - var $formattingInfo; - - /** - * @var string pattern to parse - */ - var $pattern; - - /** - * Constructor - * - * @param string $pattern - */ - function LoggerPatternParser($pattern) - { - LoggerLog::debug("LoggerPatternParser::LoggerPatternParser() pattern='$pattern'"); - - $this->pattern = $pattern; - $this->patternLength = strlen($pattern); - $this->formattingInfo = new LoggerFormattingInfo(); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - - /** - * @param LoggerPatternConverter $pc - */ - function addToList($pc) - { - // LoggerLog::debug("LoggerPatternParser::addToList()"); - - if($this->head == null) { - $this->head = $pc; - $this->tail =& $this->head; - } else { - $this->tail->next = $pc; - $this->tail =& $this->tail->next; - } - } + var $state; + var $currentLiteral; + var $patternLength; + var $i; + + /** + * @var LoggerPatternConverter + */ + var $head = null; + + /** + * @var LoggerPatternConverter + */ + var $tail = null; + + /** + * @var LoggerFormattingInfo + */ + var $formattingInfo; + + /** + * @var string pattern to parse + */ + var $pattern; - /** - * @return string - */ - function extractOption() - { - if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) { - $end = strpos($this->pattern, '}' , $this->i); - if ($end !== false) { - $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1)); - $this->i= $end + 1; - return $r; - } - } - return null; - } + /** + * Constructor + * + * @param string $pattern + */ + function LoggerPatternParser($pattern) { + $this->pattern = $pattern; + $this->patternLength = strlen($pattern); + $this->formattingInfo = new LoggerFormattingInfo(); + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; + } - /** - * The option is expected to be in decimal and positive. In case of - * error, zero is returned. - */ - function extractPrecisionOption() - { - $opt = $this->extractOption(); - $r = 0; - if ($opt !== null) { - if (is_numeric($opt)) { - $r = (int)$opt; - if($r <= 0) { - LoggerLog::warn("Precision option ({$opt}) isn't a positive integer."); - $r = 0; - } - } else { - LoggerLog::warn("Category option \"{$opt}\" not a decimal integer."); - } - } - return $r; - } + /** + * @param LoggerPatternConverter $pc + */ + function addToList($pc) { + if($this->head == null) { + $this->head = $pc; + $this->tail =& $this->head; + } else { + $this->tail->next = $pc; + $this->tail =& $this->tail->next; + } + } - function parse() - { - LoggerLog::debug("LoggerPatternParser::parse()"); - - $c = ''; - $this->i = 0; - $this->currentLiteral = ''; - while ($this->i < $this->patternLength) { - $c = $this->pattern{$this->i++}; -// LoggerLog::debug("LoggerPatternParser::parse() char is now '$c' and currentLiteral is '{$this->currentLiteral}'"); - switch($this->state) { - case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'"); - // In literal state, the last char is always a literal. - if($this->i == $this->patternLength) { - $this->currentLiteral .= $c; - continue; - } - if($c == LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) { - // LoggerLog::debug("LoggerPatternParser::parse() char is an escape char"); - // peek at the next char. - switch($this->pattern{$this->i}) { - case LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR: - // LoggerLog::debug("LoggerPatternParser::parse() next char is an escape char"); - $this->currentLiteral .= $c; - $this->i++; // move pointer - break; - case 'n': - // LoggerLog::debug("LoggerPatternParser::parse() next char is 'n'"); - $this->currentLiteral .= LOG4PHP_LINE_SEP; - $this->i++; // move pointer - break; - default: - if(strlen($this->currentLiteral) != 0) { - $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); - LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\"."); - } - $this->currentLiteral = $c; - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE; - $this->formattingInfo->reset(); - } - } else { - $this->currentLiteral .= $c; - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'"); - $this->currentLiteral .= $c; - switch($c) { - case '-': - $this->formattingInfo->leftAlign = true; - break; - case '.': - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; - break; - default: - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->min = ord($c) - ord('0'); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE; - } else { - $this->finalizeConverter($c); - } - } // switch - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0')); - } elseif ($c == '.') { - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; - } else { - $this->finalizeConverter($c); - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->max = ord($c) - ord('0'); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE; - } else { - LoggerLog::warn("LoggerPatternParser::parse() Error occured in position {$this->i}. Was expecting digit, instead got char \"{$c}\"."); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - break; - case LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE: - // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'"); - $this->currentLiteral .= $c; - if(ord($c) >= ord('0') and ord($c) <= ord('9')) { - $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0')); - } else { - $this->finalizeConverter($c); - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - } - break; - } // switch - } // while - if(strlen($this->currentLiteral) != 0) { - $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); - // LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\"."); - } - return $this->head; - } + /** + * @return string + */ + function extractOption() { + if(($this->i < $this->patternLength) and ($this->pattern{$this->i} == '{')) { + $end = strpos($this->pattern, '}' , $this->i); + if($end !== false) { + $r = substr($this->pattern, ($this->i + 1), ($end - $this->i - 1)); + $this->i= $end + 1; + return $r; + } + } + return null; + } - function finalizeConverter($c) - { - LoggerLog::debug("LoggerPatternParser::finalizeConverter() with char '$c'"); + /** + * The option is expected to be in decimal and positive. In case of + * error, zero is returned. + */ + function extractPrecisionOption() { + $opt = $this->extractOption(); + $r = 0; + if($opt !== null) { + if(is_numeric($opt)) { + $r = (int)$opt; + if($r <= 0) { + $r = 0; + } + } + } + return $r; + } - $pc = null; - switch($c) { - case 'c': - $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption()); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() CATEGORY converter."); - $this->currentLiteral = ''; - break; - case 'C': - $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption()); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() CLASSNAME converter."); - $this->currentLiteral = ''; - break; - case 'd': - $dateFormatStr = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT; - $dOpt = $this->extractOption(); + function parse() { + $c = ''; + $this->i = 0; + $this->currentLiteral = ''; + while($this->i < $this->patternLength) { + $c = $this->pattern{$this->i++}; +// LoggerLog::debug("LoggerPatternParser::parse() char is now '$c' and currentLiteral is '{$this->currentLiteral}'"); + switch($this->state) { + case LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE: + // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE'"); + // In literal state, the last char is always a literal. + if($this->i == $this->patternLength) { + $this->currentLiteral .= $c; + continue; + } + if($c == LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR) { + // LoggerLog::debug("LoggerPatternParser::parse() char is an escape char"); + // peek at the next char. + switch($this->pattern{$this->i}) { + case LOG4PHP_LOGGER_PATTERN_PARSER_ESCAPE_CHAR: + // LoggerLog::debug("LoggerPatternParser::parse() next char is an escape char"); + $this->currentLiteral .= $c; + $this->i++; // move pointer + break; + case 'n': + // LoggerLog::debug("LoggerPatternParser::parse() next char is 'n'"); + $this->currentLiteral .= PHP_EOL; + $this->i++; // move pointer + break; + default: + if(strlen($this->currentLiteral) != 0) { + $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); + } + $this->currentLiteral = $c; + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE; + $this->formattingInfo->reset(); + } + } else { + $this->currentLiteral .= $c; + } + break; + case LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE: + // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_CONVERTER_STATE'"); + $this->currentLiteral .= $c; + switch($c) { + case '-': + $this->formattingInfo->leftAlign = true; + break; + case '.': + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; + break; + default: + if(ord($c) >= ord('0') and ord($c) <= ord('9')) { + $this->formattingInfo->min = ord($c) - ord('0'); + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE; + } else { + $this->finalizeConverter($c); + } + } // switch + break; + case LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE: + // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MIN_STATE'"); + $this->currentLiteral .= $c; + if(ord($c) >= ord('0') and ord($c) <= ord('9')) { + $this->formattingInfo->min = ($this->formattingInfo->min * 10) + (ord($c) - ord('0')); + } else if ($c == '.') { + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE; + } else { + $this->finalizeConverter($c); + } + break; + case LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE: + // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_DOT_STATE'"); + $this->currentLiteral .= $c; + if(ord($c) >= ord('0') and ord($c) <= ord('9')) { + $this->formattingInfo->max = ord($c) - ord('0'); + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE; + } else { + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; + } + break; + case LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE: + // LoggerLog::debug("LoggerPatternParser::parse() state is 'LOG4PHP_LOGGER_PATTERN_PARSER_MAX_STATE'"); + $this->currentLiteral .= $c; + if(ord($c) >= ord('0') and ord($c) <= ord('9')) { + $this->formattingInfo->max = ($this->formattingInfo->max * 10) + (ord($c) - ord('0')); + } else { + $this->finalizeConverter($c); + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; + } + break; + } // switch + } // while + if(strlen($this->currentLiteral) != 0) { + $this->addToList(new LoggerLiteralPatternConverter($this->currentLiteral)); + // LoggerLog::debug("LoggerPatternParser::parse() Parsed LITERAL converter: \"{$this->currentLiteral}\"."); + } + return $this->head; + } - if($dOpt !== null) - $dateFormatStr = $dOpt; - - if ($dateFormatStr == 'ISO8601') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; - } elseif($dateFormatStr == 'ABSOLUTE') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE; - } elseif($dateFormatStr == 'DATE') { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE; - } else { - $df = $dateFormatStr; - if ($df == null) { - $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; - } - } - $pc = new LoggerDatePatternConverter($this->formattingInfo, $df); - $this->currentLiteral = ''; - break; - case 'F': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() File name converter."); - $this->currentLiteral = ''; - break; - case 'l': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() Location converter."); - $this->currentLiteral = ''; - break; - case 'L': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() LINE NUMBER converter."); - $this->currentLiteral = ''; - break; - case 'm': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() MESSAGE converter."); - $this->currentLiteral = ''; - break; - case 'M': - $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER); - $this->currentLiteral = ''; - break; - case 'p': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER); - $this->currentLiteral = ''; - break; - case 'r': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() RELATIVE TIME converter."); - $this->currentLiteral = ''; - break; - case 't': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() THREAD converter."); - $this->currentLiteral = ''; - break; - case 'u': - if($this->i < $this->patternLength) { - $cNext = $this->pattern{$this->i}; - if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) { - $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0'))); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() USER converter [{$cNext}]."); - $this->currentLiteral = ''; - $this->i++; - } else { - LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char '{$cNext}' at position {$this->i}."); - } - } - break; - case 'x': - $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() NDC converter."); - $this->currentLiteral = ''; - break; + function finalizeConverter($c) { + $pc = null; + switch($c) { + case 'c': + $pc = new LoggerCategoryPatternConverter($this->formattingInfo, $this->extractPrecisionOption()); + $this->currentLiteral = ''; + break; + case 'C': + $pc = new LoggerClassNamePatternConverter($this->formattingInfo, $this->extractPrecisionOption()); + $this->currentLiteral = ''; + break; + case 'd': + $dateFormatStr = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; // ISO8601_DATE_FORMAT; + $dOpt = $this->extractOption(); - case 'X': - $xOpt = $this->extractOption(); - $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt); - LoggerLog::debug("LoggerPatternParser::finalizeConverter() MDC converter."); - $this->currentLiteral = ''; - break; - default: - LoggerLog::warn("LoggerPatternParser::finalizeConverter() Unexpected char [$c] at position {$this->i} in conversion pattern."); - $pc = new LoggerLiteralPatternConverter($this->currentLiteral); - $this->currentLiteral = ''; - } - $this->addConverter($pc); - } + if($dOpt !== null) + $dateFormatStr = $dOpt; + + if($dateFormatStr == 'ISO8601') { + $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; + } else if($dateFormatStr == 'ABSOLUTE') { + $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ABSOLUTE; + } else if($dateFormatStr == 'DATE') { + $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_DATE; + } else { + $df = $dateFormatStr; + if($df == null) { + $df = LOG4PHP_LOGGER_PATTERN_PARSER_DATE_FORMAT_ISO8601; + } + } + $pc = new LoggerDatePatternConverter($this->formattingInfo, $df); + $this->currentLiteral = ''; + break; + case 'F': + $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FILE_LOCATION_CONVERTER); + $this->currentLiteral = ''; + break; + case 'l': + $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_FULL_LOCATION_CONVERTER); + $this->currentLiteral = ''; + break; + case 'L': + $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LINE_LOCATION_CONVERTER); + $this->currentLiteral = ''; + break; + case 'm': + $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_MESSAGE_CONVERTER); + $this->currentLiteral = ''; + break; + case 'M': + $pc = new LoggerLocationPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_METHOD_LOCATION_CONVERTER); + $this->currentLiteral = ''; + break; + case 'p': + $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_LEVEL_CONVERTER); + $this->currentLiteral = ''; + break; + case 'r': + $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_RELATIVE_TIME_CONVERTER); + $this->currentLiteral = ''; + break; + case 't': + $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_THREAD_CONVERTER); + $this->currentLiteral = ''; + break; + case 'u': + if($this->i < $this->patternLength) { + $cNext = $this->pattern{$this->i}; + if(ord($cNext) >= ord('0') and ord($cNext) <= ord('9')) { + $pc = new LoggerUserFieldPatternConverter($this->formattingInfo, (string)(ord($cNext) - ord('0'))); + $this->currentLiteral = ''; + $this->i++; + } + } + break; + case 'x': + $pc = new LoggerBasicPatternConverter($this->formattingInfo, LOG4PHP_LOGGER_PATTERN_PARSER_NDC_CONVERTER); + $this->currentLiteral = ''; + break; + case 'X': + $xOpt = $this->extractOption(); + $pc = new LoggerMDCPatternConverter($this->formattingInfo, $xOpt); + $this->currentLiteral = ''; + break; + default: + $pc = new LoggerLiteralPatternConverter($this->currentLiteral); + $this->currentLiteral = ''; + } + $this->addConverter($pc); + } - function addConverter($pc) - { - $this->currentLiteral = ''; - // Add the pattern converter to the list. - $this->addToList($pc); - // Next pattern is assumed to be a literal. - $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; - // Reset formatting info - $this->formattingInfo->reset(); - } + function addConverter($pc) { + $this->currentLiteral = ''; + // Add the pattern converter to the list. + $this->addToList($pc); + // Next pattern is assumed to be a literal. + $this->state = LOG4PHP_LOGGER_PATTERN_PARSER_LITERAL_STATE; + // Reset formatting info + $this->formattingInfo->reset(); + } } diff --git a/thirdparty/apache-log4php/src/main/php/helpers/LoggerTransform.php b/thirdparty/apache-log4php/src/main/php/helpers/LoggerTransform.php deleted file mode 100644 index 9d723d1..0000000 --- a/thirdparty/apache-log4php/src/main/php/helpers/LoggerTransform.php +++ /dev/null @@ -1,95 +0,0 @@ -'); -define('LOG4PHP_LOGGER_TRANSFORM_CDATA_PSEUDO_END', ']]>'); -define('LOG4PHP_LOGGER_TRANSFORM_CDATA_EMBEDDED_END', - LOG4PHP_LOGGER_TRANSFORM_CDATA_END . - LOG4PHP_LOGGER_TRANSFORM_CDATA_PSEUDO_END . - LOG4PHP_LOGGER_TRANSFORM_CDATA_START -); - -/** - * Utility class for transforming strings. - * - * @author Marco Vassura - * @package log4php - * @subpackage helpers - * @since 0.7 - */ -class LoggerTransform { - - /** - * This method takes a string which may contain HTML tags (ie, - * <b>, <table>, etc) and replaces any '<' and '>' - * characters with respective predefined entity references. - * - * @param string $input The text to be converted. - * @return string The input string with the characters '<' and '>' replaced with - * < and > respectively. - * @static - */ - function escapeTags($input) - { - //Check if the string is null or zero length -- if so, return - //what was sent in. - - if(empty($input)) - return $input; - - //Use a StringBuffer in lieu of String concatenation -- it is - //much more efficient this way. - - return htmlspecialchars($input, ENT_NOQUOTES); - } - - /** - * Ensures that embeded CDEnd strings (]]>) are handled properly - * within message, NDC and throwable tag text. - * - * @param string $buf String holding the XML data to this point. The - * initial CDStart () - * of the CDATA section are the responsibility of - * the calling method. - * @param string &str The String that is inserted into an existing - * CDATA Section within buf. - * @static - */ - function appendEscapingCDATA(&$buf, $str) - { - if(empty($str)) - return; - - $rStr = str_replace( - LOG4PHP_LOGGER_TRANSFORM_CDATA_END, - LOG4PHP_LOGGER_TRANSFORM_CDATA_EMBEDDED_END, - $str - ); - $buf .= $rStr; - } -} diff --git a/thirdparty/apache-log4php/src/main/php/layouts/LoggerLayoutHtml.php b/thirdparty/apache-log4php/src/main/php/layouts/LoggerLayoutHtml.php index d956e1b..2e7edd7 100644 --- a/thirdparty/apache-log4php/src/main/php/layouts/LoggerLayoutHtml.php +++ b/thirdparty/apache-log4php/src/main/php/layouts/LoggerLayoutHtml.php @@ -21,36 +21,11 @@ */ /** - * @ignore - */ -if (!defined('LOG4PHP_DIR')) define('LOG4PHP_DIR', dirname(__FILE__) . '/..'); - -if (!defined('LOG4PHP_LINE_SEP')) { - if (substr(php_uname(), 0, 7) == "Windows") { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\r\n"); - } else { - /** - * @ignore - */ - define('LOG4PHP_LINE_SEP', "\n"); - } -} - -/** - */ -require_once(LOG4PHP_DIR . '/LoggerLayout.php'); -require_once(LOG4PHP_DIR . '/spi/LoggerLoggingEvent.php'); - -/** * This layout outputs events in a HTML table. * * Parameters are: {@link $title}, {@link $locationInfo}. * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 777451 $ * @package log4php * @subpackage layouts */ @@ -68,7 +43,7 @@ class LoggerLayoutHtml extends LoggerLayout { * LocationInfo option of that appender as well. * @var boolean */ - var $locationInfo = false; + private $locationInfo = false; /** * The Title option takes a String value. This option sets the @@ -76,14 +51,12 @@ class LoggerLayoutHtml extends LoggerLayout { * Defaults to 'Log4php Log Messages'. * @var string */ - var $title = "Log4php Log Messages"; + private $title = "Log4php Log Messages"; /** * Constructor */ - function LoggerLayoutHtml() - { - return; + public function __construct() { } /** @@ -97,8 +70,7 @@ class LoggerLayoutHtml extends LoggerLayout { * or a {@link LoggerAppenderMailEvent} then make sure to set the * LocationInfo option of that appender as well. */ - function setLocationInfo($flag) - { + public function setLocationInfo($flag) { if (is_bool($flag)) { $this->locationInfo = $flag; } else { @@ -109,8 +81,7 @@ class LoggerLayoutHtml extends LoggerLayout { /** * Returns the current value of the LocationInfo option. */ - function getLocationInfo() - { + public function getLocationInfo() { return $this->locationInfo; } @@ -119,53 +90,38 @@ class LoggerLayoutHtml extends LoggerLayout { * document title of the generated HTML document. * Defaults to 'Log4php Log Messages'. */ - function setTitle($title) - { + public function setTitle($title) { $this->title = $title; } /** * @return string Returns the current value of the Title option. */ - function getTitle() - { + public function getTitle() { return $this->title; } /** * @return string Returns the content type output by this layout, i.e "text/html". */ - function getContentType() - { + public function getContentType() { return "text/html"; } /** - * No options to activate. - */ - function activateOptions() - { - return true; - } - - /** * @param LoggerLoggingEvent $event * @return string */ - function format($event) - { - $sbuf = LOG4PHP_LINE_SEP . "| Time | " . LOG4PHP_LINE_SEP; - $sbuf .= "Thread | " . LOG4PHP_LINE_SEP; - $sbuf .= "Level | " . LOG4PHP_LINE_SEP; - $sbuf .= "Category | " . LOG4PHP_LINE_SEP; + public function getHeader() { + $sbuf = "" . PHP_EOL; + $sbuf .= "" . PHP_EOL; + $sbuf .= "" . PHP_EOL; + $sbuf .= "
|---|
| Time | " . PHP_EOL; + $sbuf .= "Thread | " . PHP_EOL; + $sbuf .= "Level | " . PHP_EOL; + $sbuf .= "Category | " . PHP_EOL; if ($this->locationInfo) - $sbuf .= "File:Line | " . LOG4PHP_LINE_SEP; - $sbuf .= "Message | " . LOG4PHP_LINE_SEP; - $sbuf .= "File:Line | " . PHP_EOL; + $sbuf .= "Message | " . PHP_EOL; + $sbuf .= "" . PHP_EOL; return $sbuf; } @@ -247,10 +201,9 @@ class LoggerLayoutHtml extends LoggerLayout { /** * @return string Returns the appropriate HTML footers. */ - function getFooter() - { - $sbuf = "
|---|
Parameters: {@link $locationInfo}.
@@ -46,12 +29,22 @@ require_once(LOG4PHP_DIR . '/LoggerLayout.php'); * The output is designed to be included as an external entity in a separate file to form * a correct XML file. * - * @author Marco Vassura - * @version $Revision: 635069 $ + * @version $Revision: 778059 $ * @package log4php * @subpackage layouts */ -class LoggerXmlLayout extends LoggerLayout { +class LoggerLayoutXml extends LoggerLayout { + const LOG4J_NS_PREFIX ='log4j'; + const LOG4J_NS = 'http://jakarta.apache.org/log4j/'; + + const LOG4PHP_NS_PREFIX = 'log4php'; + const LOG4PHP_NS = 'http://logging.apache.org/log4php/'; + + const CDATA_START = ''; + const CDATA_PSEUDO_END = ']]>'; + + const CDATA_EMBEDDED_END = ']]>]]>LocationInfo option takes a boolean value. By default, @@ -61,45 +54,43 @@ class LoggerXmlLayout extends LoggerLayout { * origin of the log statement will be output. * @var boolean */ - var $locationInfo = true; + private $locationInfo = true; /** * @var boolean set the elements namespace */ - var $log4jNamespace = false; + private $log4jNamespace = false; /** * @var string namespace * @private */ - var $_namespace = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS; + private $_namespace = self::LOG4PHP_NS; /** * @var string namespace prefix * @private */ - var $_namespacePrefix = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS_PREFIX; + private $_namespacePrefix = self::LOG4PHP_NS_PREFIX; /** * No options to activate. */ - function activateOptions() - { + public function activateOptions() { if ($this->getLog4jNamespace()) { - $this->_namespace = LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS; - $this->_namespacePrefix = LOG4PHP_LOGGER_XML_LAYOUT_LOG4J_NS_PREFIX; + $this->_namespace = self::LOG4J_NS; + $this->_namespacePrefix = self::LOG4J_NS_PREFIX; } else { - $this->_namespace = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS; - $this->_namespacePrefix = LOG4PHP_LOGGER_XML_LAYOUT_LOG4PHP_NS_PREFIX; + $this->_namespace = self::LOG4PHP_NS; + $this->_namespacePrefix = self::LOG4PHP_NS_PREFIX; } } /** * @return string */ - function getHeader() - { + public function getHeader() { return "<{$this->_namespacePrefix}:eventSet ". "xmlns:{$this->_namespacePrefix}=\"{$this->_namespace}\" ". "version=\"0.3\" ". @@ -113,24 +104,23 @@ class LoggerXmlLayout extends LoggerLayout { * @param LoggerLoggingEvent $event * @return string */ - function format($event) - { + public function format(LoggerLoggingEvent $event) { $loggerName = $event->getLoggerName(); $timeStamp = number_format((float)($event->getTimeStamp() * 1000), 0, '', ''); $thread = $event->getThreadName(); $level = $event->getLevel(); $levelStr = $level->toString(); - $buf = "<{$this->_namespacePrefix}:event logger=\"{$loggerName}\" level=\"{$levelStr}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">\r\n"; + $buf = "<{$this->_namespacePrefix}:event logger=\"{$loggerName}\" level=\"{$levelStr}\" thread=\"{$thread}\" timestamp=\"{$timeStamp}\">".PHP_EOL; $buf .= "<{$this->_namespacePrefix}:message>getRenderedMessage()); - $buf .= "]]>_namespacePrefix}:message>\r\n"; + $this->appendEscapingCDATA($buf, $event->getRenderedMessage()); + $buf .= "]]>_namespacePrefix}:message>".PHP_EOL; $ndc = $event->getNDC(); if($ndc != null) { $buf .= "<{$this->_namespacePrefix}:NDC>_namespacePrefix}:NDC>\r\n"; + $this->appendEscapingCDATA($buf, $ndc); + $buf .= "]]>_namespacePrefix}:NDC>".PHP_EOL; } if ($this->getLocationInfo()) { @@ -140,11 +130,11 @@ class LoggerXmlLayout extends LoggerLayout { "file=\"" . htmlentities($locationInfo->getFileName(), ENT_QUOTES) . "\" ". "line=\"" . $locationInfo->getLineNumber() . "\" ". "method=\"" . $locationInfo->getMethodName() . "\" "; - $buf .= "/>\r\n"; + $buf .= "/>".PHP_EOL; } - $buf .= "_namespacePrefix}:event>\r\n\r\n"; + $buf .= "_namespacePrefix}:event>".PHP_EOL.PHP_EOL; return $buf; @@ -153,56 +143,58 @@ class LoggerXmlLayout extends LoggerLayout { /** * @return string */ - function getFooter() - { - + public function getFooter() { return "_namespacePrefix}:eventSet>\r\n"; } /** * @return boolean */ - function getLocationInfo() - { + public function getLocationInfo() { return $this->locationInfo; } /** - * @return boolean - */ - function getLog4jNamespace() - { - return $this->log4jNamespace; - } - - /** - * The XMLLayout prints and does not ignore exceptions. Hence the - * return value false. - * @return boolean - */ - function ignoresThrowable() - { - return false; - } - - /** * The {@link $locationInfo} option takes a boolean value. By default, * it is set to false which means there will be no location * information output by this layout. If the the option is set to * true, then the file name and line number of the statement at the * origin of the log statement will be output. */ - function setLocationInfo($flag) - { + function setLocationInfo($flag) { $this->locationInfo = LoggerOptionConverter::toBoolean($flag, true); } /** * @param boolean */ - function setLog4jNamespace($flag) - { + function setLog4jNamespace($flag) { $this->log4jNamespace = LoggerOptionConverter::toBoolean($flag, true); } + + /** + * Ensures that embeded CDEnd strings (]]>) are handled properly + * within message, NDC and throwable tag text. + * + * @param string $buf String holding the XML data to this point. The + * initial CDStart () + * of the CDATA section are the responsibility of + * the calling method. + * @param string &str The String that is inserted into an existing + * CDATA Section within buf. + * @static + */ + private function appendEscapingCDATA(&$buf, $str) { + if(empty($str)) { + return; + } + + $rStr = str_replace( + self::CDATA_END, + self::CDATA_EMBEDDED_END, + $str + ); + $buf .= $rStr; + } } diff --git a/thirdparty/apache-log4php/src/main/php/or/LoggerDefaultRenderer.php b/thirdparty/apache-log4php/src/main/php/renderers/LoggerRendererDefault.php index 0974494..6fa986f 100644 --- a/thirdparty/apache-log4php/src/main/php/or/LoggerDefaultRenderer.php +++ b/thirdparty/apache-log4php/src/main/php/renderers/LoggerRendererDefault.php @@ -1,13 +1,13 @@ map = array(); - $this->defaultRenderer = new LoggerDefaultRenderer(); - } + /** + * Constructor + */ + public function __construct() { + $this->map = array(); + $this->defaultRenderer = new LoggerRendererDefault(); + } - /** - * Add a renderer to a hierarchy passed as parameter. - * Note that hierarchy must implement getRendererMap() and setRenderer() methods. - * - * @param LoggerHierarchy $repository a logger repository. - * @param string $renderedClassName - * @param string $renderingClassName - * @static - */ - public static function addRenderer($repository, $renderedClassName, $renderingClassName) - { - LoggerLog::debug("LoggerRendererMap::addRenderer() Rendering class: [{$renderingClassName}], Rendered class: [{$renderedClassName}]."); - $renderer = LoggerObjectRenderer::factory($renderingClassName); - if($renderer == null) { - LoggerLog::warn("LoggerRendererMap::addRenderer() Could not instantiate renderer [{$renderingClassName}]."); - return; - } else { - $repository->setRenderer($renderedClassName, $renderer); - } - } + /** + * Add a renderer to a hierarchy passed as parameter. + * Note that hierarchy must implement getRendererMap() and setRenderer() methods. + * + * @param LoggerHierarchy $repository a logger repository. + * @param string $renderedClassName + * @param string $renderingClassName + * @static + */ + public static function addRenderer($repository, $renderedClassName, $renderingClassName) { + $renderer = LoggerReflectionUtils::createObject($renderingClassName); + if($renderer == null) { + return; + } else { + $repository->setRenderer($renderedClassName, $renderer); + } + } - /** - * Find the appropriate renderer for the class type of the - * o parameter. - * - * This is accomplished by calling the {@link getByObject()} - * method if o is object or using {@link LoggerDefaultRenderer}. - * Once a renderer is found, it is applied on the object o and - * the result is returned as a string. - * - * @param mixed $o - * @return string - */ - public function findAndRender($o) - { - if($o == null) { - return null; - } else { - if (is_object($o)) { - $renderer = $this->getByObject($o); - if ($renderer !== null) { - return $renderer->doRender($o); - } else { - return null; - } - } else { - $renderer = $this->defaultRenderer; - return $renderer->doRender($o); - } - } - } + /** + * Find the appropriate renderer for the class type of the + * o parameter. + * + * This is accomplished by calling the {@link getByObject()} + * method if o is object or using {@link LoggerRendererDefault}. + * Once a renderer is found, it is applied on the object o and + * the result is returned as a string. + * + * @param mixed $o + * @return string + */ + public function findAndRender($o) { + if($o == null) { + return null; + } else { + if(is_object($o)) { + $renderer = $this->getByObject($o); + if($renderer !== null) { + return $renderer->doRender($o); + } else { + return null; + } + } else { + $renderer = $this->defaultRenderer; + return $renderer->doRender($o); + } + } + } - /** - * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the - * class of the object parameter. - * - * @param mixed $o - * @return string - */ - public function getByObject($o) - { - return ($o == null) ? null : $this->getByClassName(get_class($o)); - } + /** + * Syntactic sugar method that calls {@link PHP_MANUAL#get_class} with the + * class of the object parameter. + * + * @param mixed $o + * @return string + */ + public function getByObject($o) { + return ($o == null) ? null : $this->getByClassName(get_class($o)); + } - /** - * Search the parents of clazz for a renderer. - * - * The renderer closest in the hierarchy will be returned. If no - * renderers could be found, then the default renderer is returned. - * - * @param string $class - * @return LoggerObjectRenderer - */ - public function getByClassName($class) - { - $r = null; - for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) { - if (isset($this->map[$c])) { - return $this->map[$c]; - } - } - return $this->defaultRenderer; - } + /** + * Search the parents of clazz for a renderer. + * + * The renderer closest in the hierarchy will be returned. If no + * renderers could be found, then the default renderer is returned. + * + * @param string $class + * @return LoggerRendererObject + */ + public function getByClassName($class) { + $r = null; + for($c = strtolower($class); !empty($c); $c = get_parent_class($c)) { + if(isset($this->map[$c])) { + return $this->map[$c]; + } + } + return $this->defaultRenderer; + } - /** - * @return LoggerDefaultRenderer - */ - public function getDefaultRenderer() - { - return $this->defaultRenderer; - } + /** + * @return LoggerRendererDefault + */ + public function getDefaultRenderer() { + return $this->defaultRenderer; + } - public function clear() - { - $this->map = array(); - } + public function clear() { + $this->map = array(); + } - /** - * Register a {@link LoggerObjectRenderer} for clazz. - * @param string $class - * @param LoggerObjectRenderer $or - */ - public function put($class, $or) - { - $this->map[strtolower($class)] = $or; - } - - /** - * @param string $class - * @return boolean - */ - public function rendererExists($class) - { - $class = basename($class); - if (!class_exists($class)) { - include_once(LOG4PHP_DIR ."/or/{$class}.php"); - } - return class_exists($class); - } + /** + * Register a {@link LoggerRendererObject} for clazz. + * @param string $class + * @param LoggerRendererObject $or + */ + public function put($class, $or) { + $this->map[strtolower($class)] = $or; + } + + /** + * @param string $class + * @return boolean + */ + public function rendererExists($class) { + $class = basename($class); + return class_exists($class); + } } diff --git a/thirdparty/apache-log4php/src/main/php/or/LoggerObjectRenderer.php b/thirdparty/apache-log4php/src/main/php/renderers/LoggerRendererObject.php index b9749e7..5774687 100644 --- a/thirdparty/apache-log4php/src/main/php/or/LoggerObjectRenderer.php +++ b/thirdparty/apache-log4php/src/main/php/renderers/LoggerRendererObject.php @@ -1,13 +1,13 @@ - + - - + + + + @@ -37,18 +40,14 @@ element. --> - + - - - - @@ -63,46 +62,47 @@ element. --> - + - + + @@ -141,8 +141,8 @@ element. --> diff --git a/thirdparty/apache-log4php/src/site/apt/download.apt b/thirdparty/apache-log4php/src/site/apt/download.apt new file mode 100644 index 0000000..48d80f2 --- /dev/null +++ b/thirdparty/apache-log4php/src/site/apt/download.apt @@ -0,0 +1,26 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one or more +~~ contributor license agreements. See the NOTICE file distributed with +~~ this work for additional information regarding copyright ownership. +~~ The ASF licenses this file to You under the Apache License, Version 2.0 +~~ (the "License"); you may not use this file except in compliance with +~~ the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. + ------ +Download apache-log4php + ------ + ------ + ------ + +Download apache-log4php + + Apache log4php is distributed under the {{{http://www.apache.org/licenses/LICENSE-2.0.html} Apache License, version 2.0}}. + + + No releases have yet been made. diff --git a/thirdparty/apache-log4php/src/site/apt/index.apt b/thirdparty/apache-log4php/src/site/apt/index.apt new file mode 100644 index 0000000..71e0d60 --- /dev/null +++ b/thirdparty/apache-log4php/src/site/apt/index.apt @@ -0,0 +1,43 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one or more +~~ contributor license agreements. See the NOTICE file distributed with +~~ this work for additional information regarding copyright ownership. +~~ The ASF licenses this file to You under the Apache License, Version 2.0 +~~ (the "License"); you may not use this file except in compliance with +~~ the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. + ------ + Apache log4php + ------ + ------ + ------ + + Log4php is logging framework for PHP undergoing incubation at the Apache Software Foundation (ASF), + sponsored by the Apache Logging Services project. + Incubation is required of all newly accepted projects until a further review + indicates that the infrastructure, communications, and decision making process + have stabilized in a manner consistent with other successful ASF projects. + While incubation status is not necessarily a reflection of the completeness or + stability of the code, it does indicate that the project has yet to be + fully endorsed by the ASF. + + + log4php supports: + + * Configuration through xml and properties file (same structure as log4j). + + * File, RollingFile, DailyFile, Echo, Console, Mail, PEAR::Db, PHP error, + Syslog or NT events and Socket appenders. + + * Simple, TTCC, Pattern, Html and Xml Layouts. + + * Nested (NDC) and Mapped (MDC) Diagnostic Contexts. + + * Switchable internal debug. + diff --git a/thirdparty/apache-log4php/src/site/apt/roadmap.apt b/thirdparty/apache-log4php/src/site/apt/roadmap.apt new file mode 100644 index 0000000..1103d30 --- /dev/null +++ b/thirdparty/apache-log4php/src/site/apt/roadmap.apt @@ -0,0 +1,25 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one or more +~~ contributor license agreements. See the NOTICE file distributed with +~~ this work for additional information regarding copyright ownership. +~~ The ASF licenses this file to You under the Apache License, Version 2.0 +~~ (the "License"); you may not use this file except in compliance with +~~ the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. + ------ + apache-log4php Roadmap + ------ + Curt Arnold + ------ + 4 June 2007 + ------ + +apache-log4php Roadmap + + TODO diff --git a/thirdparty/apache-log4php/src/site/apt/usage.apt b/thirdparty/apache-log4php/src/site/apt/usage.apt new file mode 100644 index 0000000..c4e5587 --- /dev/null +++ b/thirdparty/apache-log4php/src/site/apt/usage.apt @@ -0,0 +1,142 @@ +~~ Licensed to the Apache Software Foundation (ASF) under one or more +~~ contributor license agreements. See the NOTICE file distributed with +~~ this work for additional information regarding copyright ownership. +~~ The ASF licenses this file to You under the Apache License, Version 2.0 +~~ (the "License"); you may not use this file except in compliance with +~~ the License. You may obtain a copy of the License at +~~ +~~ http://www.apache.org/licenses/LICENSE-2.0 +~~ +~~ Unless required by applicable law or agreed to in writing, software +~~ distributed under the License is distributed on an "AS IS" BASIS, +~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +~~ See the License for the specific language governing permissions and +~~ limitations under the License. + ------ + Apache log4php usage example + ------ + ------ + ------ + +Apache Log4php Usage Example"> + ++-- +logger =& LoggerManager::getLogger('Test'); + } + + function testLog() + { + $this->logger->debug('this is a DEBUG log generated by Test::testLog() class'); + $this->logger->info('this is an INFO log generated by Test::testLog() class'); + $this->logger->warn('this is a WARN log generated by Test::testLog() class'); + $this->logger->error('this is an ERROR log generated by Test::testLog() class'); + $this->logger->fatal('this is a FATAL log generated by Test::testLog() class'); + } +} + +class TestTest extends Test { + var $logger; + + function TestTest() + { + $this->Test(); + $this->logger =& LoggerManager::getLogger('Test.Test'); + } + + function testLog() + { + LoggerNDC::push('NDC generated by TestTest::testLog()'); + + $this->logger->debug('this is a DEBUG log generated by TestTest::testLog() class'); + $this->logger->info('this is an INFO log generated by TestTest::testLog() class'); + $this->logger->warn('this is a WARN log generated by TestTest::testLog() class'); + $this>->logger->error('this is an ERROR log generated by TestTest::testLog() class'); + $this->logger->fatal('this is a FATAL log generated by TestTest::testLog() class'); + + LoggerNDC::pop(); + } +} + +function Bar() +{ + $logger =& LoggerManager::getLogger('bar'); + + /* + note that the message here is an array + */ + + $logger->debug(array('one', 'two', 'tree')); + $logger->info('this is an INFO log generated by Bar() function'); + $logger->warn('this is a WARN log generated by Bar() function'); + $logger->error('this is an ERROR log generated by Bar() function'); + $logger->fatal('this is a FATAL log generated by Bar() function'); +} + +$logger =& LoggerManager::getLogger('main'); +$logger->debug('this is a DEBUG log generated by main() function'); +$logger->info('this is an INFO log generated by main() function'); +$logger->warn('this is a WARN log generated by main() function'); +$logger->error('this is an ERROR log generated by main() function'); +$logger->fatal('this is a FATAL log generated by main() function') + +$test = new Test(); +$test->testLog(); + +$testTest = new TestTest(); +$testTest->testLog(); + +Bar(); +?> ++-- diff --git a/thirdparty/apache-log4php/src/site/resources/css/site.css b/thirdparty/apache-log4php/src/site/resources/css/site.css new file mode 100644 index 0000000..cab7f25 --- /dev/null +++ b/thirdparty/apache-log4php/src/site/resources/css/site.css @@ -0,0 +1,18 @@ +/* + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/ + diff --git a/thirdparty/apache-log4php/src/site/resources/images/apache-incubator-logo.png b/thirdparty/apache-log4php/src/site/resources/images/apache-incubator-logo.png new file mode 100644 index 0000000..81fb31e --- /dev/null +++ b/thirdparty/apache-log4php/src/site/resources/images/apache-incubator-logo.png diff --git a/thirdparty/apache-log4php/src/site/resources/images/logo.jpg b/thirdparty/apache-log4php/src/site/resources/images/logo.jpg new file mode 100644 index 0000000..5b6ede8 --- /dev/null +++ b/thirdparty/apache-log4php/src/site/resources/images/logo.jpg diff --git a/thirdparty/apache-log4php/src/site/resources/images/ls-logo.jpg b/thirdparty/apache-log4php/src/site/resources/images/ls-logo.jpg new file mode 100755 index 0000000..611c5c3 --- /dev/null +++ b/thirdparty/apache-log4php/src/site/resources/images/ls-logo.jpg diff --git a/thirdparty/apache-log4php/src/site/site.xml b/thirdparty/apache-log4php/src/site/site.xml new file mode 100644 index 0000000..44b052b --- /dev/null +++ b/thirdparty/apache-log4php/src/site/site.xml @@ -0,0 +1,68 @@ + ++ Here is a list (in alphabetical order) of the developers that + (directly or indirectly) contributed to enhance the project. + Thank You all! +
+ +Abel is the author of the LoggerAppenderDailyFile appender.
+Bugs hunting, hints and modifications.
+Developer of the LoggerAppenderMailEvent appender.
+An endless source of ideas, contribs and bugs hunting. Thank You guy!
+The founder of the project and source code maintainer.
+Blake is the author of the LoggerAppenderAdodb appender.
+Bugs hunting, hints.
++
+ Log4php project has started the incubation phase in order to become + an apache project. The license has changed from LGPL to ASL 2.0. +
+After unpacking the distribution file the following source tree will be created:
+
+log4php-{version}
+ +---docs
+ | +---api
+ | qsg.html (this file)
+ | ...
+ \---src
+ +---log4php
+ | +---appenders
+ | +---config
+ | +---helpers
+ | +---layouts
+ | +---or
+ | +---spi
+ | +---varia
+ | \---xml
+ \---tests
+ ...
+
+
+ Copy the "log4php-{version}/src/log4php" directory in a place accessible by PHP
+ (called in this document {LOG4PHP-ROOT})
+ and that's all! Log4php is installed.
+ Optionally the LOG4PHP_DIR
+ constant can be defined to point to {LOG4PHP-ROOT}.
+
+ Three steps are required to use log4php: +
+tests/*/configs directories for examples.log4php.dtd for xml elements reference.LOG4PHP_CONFIGURATION
+ constant to point to the configuration above.
+ LOG4PHP_CONFIGURATOR_CLASS
+ constant to point to a configuration class file.
+ LoggerManager.php'
+ class file in your php scripts.
+
+ Once the 'LoggerManager' is included,
+ it will start the default init procedure
+ that can be parameterized by the previously defined
+ LOG4PHP_DEFAULT_INIT_OVERRIDE,
+ LOG4PHP_CONFIGURATION and
+ LOG4PHP_CONFIGURATOR_CLASS
+ constants.
+
Here is how to use log4php in user PHP code:
+<?php
+
+// Setting default timezone
+date_default_timezone_set('Europe/London');
+
+/*
+ Set LOG4PHP_* constants here
+*/
+
+require_once(LOG4PHP_DIR . '/LoggerManager.php');
+
+/*
+ In a class
+*/
+class Log4phpTest {
+ /*
+ Your public and private vars
+ */
+ var $_logger;
+
+ function Log4phpTest()
+ {
+ $this->_logger =& LoggerManager::getLogger('Log4phpTest');
+ $this->_logger->debug('Hello!');
+ }
+
+}
+
+function Log4phpTestFunction()
+{
+ $logger =& LoggerManager::getLogger('Log4phpTestFunction');
+ $logger->debug('Hello again!');
+}
+
+/*
+ Your PHP code
+*/
+
+//Safely close all appenders with...
+
+LoggerManager::shutdown();
+
+?>
+
+