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

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Log
 * @subpackage Writer
-* @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: Syslog.php 22977 2010-09-19 12:44:00Z intiilapa $
+* @version    $Id: Syslog.php 25024 2012-07-30 15:08:15Z rob $
 */
 /** Zend_Log */
 require_once 'Zend/Log.php';
 * Writes log messages to syslog
 *
 * @category   Zend
 * @package    Zend_Log
 * @subpackage Writer
-* @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
 */
 class Zend_Log_Writer_Syslog extends Zend_Log_Writer_Abstract
 {
 /**
 * Maps Zend_Log priorities to PHP's syslog priorities
+*
 * @var array
 */
 protected $_priorities = array(
 Zend_Log::EMERG  => LOG_EMERG,
 Zend_Log::ALERT  => LOG_ALERT,
 Zend_Log::DEBUG  => LOG_DEBUG,
 );
 /**
 * The default log priority - for unmapped custom priorities
+*
 * @var string
 */
 protected $_defaultPriority = LOG_NOTICE;
 /**
 * Last application name set by a syslog-writer instance
+*
 * @var string
 */
 protected static $_lastApplication;
 /**
 * Last facility name set by a syslog-writer instance
+*
 * @var string
 */
 protected static $_lastFacility;
 /**
 * Application name used by this syslog-writer instance
+*
 * @var string
 */
 protected $_application = 'Zend_Log';
 /**
 * Facility used by this syslog-writer instance
+*
 * @var int
 */
 protected $_facility = LOG_USER;
 /**
-* _validFacilities
+* Types of program available to logging of message
 *
 * @var array
 */
 protected $_validFacilities = array();
 /**
 * Class constructor
 *
-* @param  array $options Array of options; may include "application" and "facility" keys
+* @param  array $params Array of options; may include "application" and "facility" keys
 * @return void
 */
 public function __construct(array $params = array())
 {
 if (isset($params['application'])) {
 $this->_application = $params['application'];
 }
 $runInitializeSyslog = true;
 if (isset($params['facility'])) {
-$this->_facility = $this->setFacility($params['facility']);
+$this->setFacility($params['facility']);
 $runInitializeSyslog = false;
 }
 if ($runInitializeSyslog) {
 $this->_initializeSyslog();
 /**
 * Create a new instance of Zend_Log_Writer_Syslog
 *
 * @param  array|Zend_Config $config
 * @return Zend_Log_Writer_Syslog
-* @throws Zend_Log_Exception
 */
 static public function factory($config)
 {
 return new self(self::_parseConfig($config));
 }
 /**
 * Set syslog facility
 *
 * @param  int $facility Syslog facility
-* @return void
+* @return Zend_Log_Writer_Syslog
 * @throws Zend_Log_Exception for invalid log facility
 */
 public function setFacility($facility)
 {
 if ($this->_facility === $facility) {
 /**
 * Set application name
 *
 * @param  string $application Application name
-* @return void
+* @return Zend_Log_Writer_Syslog
 */
 public function setApplicationName($application)
 {
 if ($this->_application === $application) {
 return $this;
 }
 /**
 * Write a message to syslog.
 *
-* @param  array $event  event data
+* @param  array $event event data
 * @return void
 */
 protected function _write($event)
 {
 if (array_key_exists($event['priority'], $this->_priorities)) {
 || $this->_facility !== self::$_lastFacility)
 {
 $this->_initializeSyslog();
 }
-syslog($priority, $event['message']);
+$message = $event['message'];
+if ($this->_formatter instanceof Zend_Log_Formatter_Interface) {
+$message = $this->_formatter->format($event);
+}
+syslog($priority, $message);
 }
 }

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