tweet_live: comparison web/lib/Zend/Log.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * obtain it through the world-wide-web, please send an email
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Log
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Log.php 22976 2010-09-19 11:57:26Z intiilapa $
+* @version    $Id: Log.php 25131 2012-11-16 15:29:18Z rob $
 */
 /**
 * @category   Zend
 * @package    Zend_Log
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Log.php 22976 2010-09-19 11:57:26Z intiilapa $
+* @version    $Id: Log.php 25131 2012-11-16 15:29:18Z rob $
 */
 class Zend_Log
 {
 const EMERG   = 0;  // Emergency: system is unusable
 const ALERT   = 1;  // Alert: action must be taken immediately
 */
 protected $_defaultFilterNamespace = 'Zend_Log_Filter';
 /**
 *
+* @var string
+*/
+protected $_defaultFormatterNamespace = 'Zend_Log_Formatter';
+/**
+*
 * @var callback
 */
 protected $_origErrorHandler       = null;
 /**
 */
 protected $_registeredErrorHandler = false;
 /**
 *
-* @var array
+* @var array|boolean
 */
 protected $_errorHandlerMap        = false;
 /**
 *
 /**
 * Class constructor.  Create a new logger
 *
 * @param Zend_Log_Writer_Abstract|null  $writer  default writer
+* @return void
 */
 public function __construct(Zend_Log_Writer_Abstract $writer = null)
 {
 $r = new ReflectionClass($this);
 $this->_priorities = array_flip($r->getConstants());
 * Factory to construct the logger and one or more writers
 * based on the configuration array
 *
 * @param  array|Zend_Config Array or instance of Zend_Config
 * @return Zend_Log
+* @throws Zend_Log_Exception
 */
 static public function factory($config = array())
 {
 if ($config instanceof Zend_Config) {
 $config = $config->toArray();
 require_once 'Zend/Log/Exception.php';
 throw new Zend_Log_Exception('Configuration must be an array or instance of Zend_Config');
 }
 $log = new self;
+if (array_key_exists('timestampFormat', $config)) {
+if (null != $config['timestampFormat'] && '' != $config['timestampFormat']) {
+$log->setTimestampFormat($config['timestampFormat']);
+}
+unset($config['timestampFormat']);
+}
 if (!is_array(current($config))) {
 $log->addWriter(current($config));
 } else {
 foreach($config as $writer) {
 /**
 * Construct a writer object based on a configuration array
 *
 * @param  array $spec config array with writer spec
 * @return Zend_Log_Writer_Abstract
+* @throws Zend_Log_Exception
 */
 protected function _constructWriterFromConfig($config)
 {
 $writer = $this->_constructFromConfig('writer', $config, $this->_defaultWriterNamespace);
 if (isset($config['filterName'])) {
 $filter = $this->_constructFilterFromConfig($config);
 $writer->addFilter($filter);
 }
+if (isset($config['formatterName'])) {
+$formatter = $this->_constructFormatterFromConfig($config);
+$writer->setFormatter($formatter);
+}
 return $writer;
 }
 /**
 * Construct filter object from configuration array or Zend_Config object
 *
 * @param  array|Zend_Config $config Zend_Config or Array
 * @return Zend_Log_Filter_Interface
+* @throws Zend_Log_Exception
 */
 protected function _constructFilterFromConfig($config)
 {
 $filter = $this->_constructFromConfig('filter', $config, $this->_defaultFilterNamespace);
 }
 return $filter;
 }
+/**
+* Construct formatter object from configuration array or Zend_Config object
+*
+* @param  array|Zend_Config $config Zend_Config or Array
+* @return Zend_Log_Formatter_Interface
+* @throws Zend_Log_Exception
+*/
+protected function _constructFormatterFromConfig($config)
+{
+$formatter = $this->_constructFromConfig('formatter', $config, $this->_defaultFormatterNamespace);
+if (!$formatter instanceof Zend_Log_Formatter_Interface) {
+$formatterName = is_object($formatter)
+? get_class($formatter)
+: 'The specified formatter';
+/** @see Zend_Log_Exception */
+require_once 'Zend/Log/Exception.php';
+throw new Zend_Log_Exception($formatterName . ' does not implement Zend_Log_Formatter_Interface');
+}
+return $formatter;
+}
 /**
 * Construct a filter or writer from config
 *
 * @param string $type 'writer' of 'filter'
 * @param mixed $config Zend_Config or Array
 * @param string $namespace
 * @return object
+* @throws Zend_Log_Exception
 */
 protected function _constructFromConfig($type, $config, $namespace)
 {
 if ($config instanceof Zend_Config) {
 $config = $config->toArray();
 $reflection = new ReflectionClass($className);
 if (!$reflection->implementsInterface('Zend_Log_FactoryInterface')) {
 require_once 'Zend/Log/Exception.php';
 throw new Zend_Log_Exception(
-'Driver does not implement Zend_Log_FactoryInterface and can not be constructed from config.'
+$className . ' does not implement Zend_Log_FactoryInterface and can not be constructed from config.'
 );
 }
 return call_user_func(array($className, 'factory'), $params);
 }
 *
 * @param array $config
 * @param string $type filter|writer
 * @param string $defaultNamespace
 * @return string full classname
+* @throws Zend_Log_Exception
 */
 protected function getClassName($config, $type, $defaultNamespace)
 {
-if (!isset($config[ $type . 'Name' ])) {
+if (!isset($config[$type . 'Name'])) {
 require_once 'Zend/Log/Exception.php';
 throw new Zend_Log_Exception("Specify {$type}Name in the configuration array");
 }
-$className = $config[ $type . 'Name' ];
+$className = $config[$type . 'Name'];
 $namespace = $defaultNamespace;
-if (isset($config[ $type . 'Namespace' ])) {
-$namespace = $config[ $type . 'Namespace' ];
+if (isset($config[$type . 'Namespace'])) {
-}
+$namespace = $config[$type . 'Namespace'];
+}
-$fullClassName = $namespace . '_' . $className;
-return $fullClassName;
+// PHP >= 5.3.0 namespace given?
+if (substr($namespace, -1) == '\\') {
+return $namespace . $className;
+}
+// emtpy namespace given?
+if (strlen($namespace) === 0) {
+return $className;
+}
+return $namespace . '_' . $className;
 }
 /**
 * Packs message and priority into Event array
 *
 * @param  string   $message   Message to log
 * @param  integer  $priority  Priority of message
 * @return array Event array
-**/
+*/
 protected function _packEvent($message, $priority)
 {
 return array_merge(array(
 'timestamp'    => date($this->_timestampFormat),
 'message'      => $message,
 /**
 * Add a custom priority
 *
 * @param  string   $name      Name of priority
 * @param  integer  $priority  Numeric priority
-* @throws Zend_Log_InvalidArgumentException
+* @throws Zend_Log_Exception
 */
 public function addPriority($name, $priority)
 {
 // Priority names must be uppercase for predictability.
 $name = strtoupper($name);
 /**
 * Add a filter that will be applied before all log writers.
 * Before a message will be received by any of the writers, it
 * must be accepted by all filters added with this method.
 *
-* @param  int|Zend_Log_Filter_Interface $filter
+* @param  int|Zend_Config|array|Zend_Log_Filter_Interface $filter
-* @return void
+* @return Zend_Log
+* @throws Zend_Log_Exception
 */
 public function addFilter($filter)
 {
-if (is_integer($filter)) {
+if (is_int($filter)) {
 /** @see Zend_Log_Filter_Priority */
 require_once 'Zend/Log/Filter/Priority.php';
 $filter = new Zend_Log_Filter_Priority($filter);
 } elseif ($filter instanceof Zend_Config || is_array($filter)) {
 /**
 * Add a writer.  A writer is responsible for taking a log
 * message and writing it out to storage.
 *
 * @param  mixed $writer Zend_Log_Writer_Abstract or Config array
-* @return void
+* @return Zend_Log
 */
 public function addWriter($writer)
 {
 if (is_array($writer) || $writer instanceof  Zend_Config) {
 $writer = $this->_constructWriterFromConfig($writer);
 }
 /**
 * Set an extra item to pass to the log writers.
 *
-* @param  $name    Name of the field
+* @param  string $name    Name of the field
-* @param  $value   Value of the field
+* @param  string $value   Value of the field
-* @return void
+* @return Zend_Log
 */
 public function setEventItem($name, $value)
 {
 $this->_extras = array_merge($this->_extras, array($name => $value));
 return $this;
 */
 public function registerErrorHandler()
 {
 // Only register once.  Avoids loop issues if it gets registered twice.
 if ($this->_registeredErrorHandler) {
-	return $this;
+return $this;
 }
 $this->_origErrorHandler = set_error_handler(array($this, 'errorHandler'));
 // Contruct a default map of phpErrors to Zend_Log priorities.
 */
 public function errorHandler($errno, $errstr, $errfile, $errline, $errcontext)
 {
 $errorLevel = error_reporting();
-if ($errorLevel && $errno) {
+if ($errorLevel & $errno) {
 if (isset($this->_errorHandlerMap[$errno])) {
 $priority = $this->_errorHandlerMap[$errno];
 } else {
 $priority = Zend_Log::INFO;
 }

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c