diff -r 5e7a0fedabdf -r 877f952ae2bd web/lib/Zend/Log/Writer/Syslog.php --- a/web/lib/Zend/Log/Writer/Syslog.php Thu Mar 21 17:31:31 2013 +0100 +++ b/web/lib/Zend/Log/Writer/Syslog.php Thu Mar 21 19:50:53 2013 +0100 @@ -15,9 +15,9 @@ * @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 */ @@ -32,13 +32,14 @@ * @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( @@ -54,36 +55,41 @@ /** * 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 */ @@ -92,7 +98,7 @@ /** * 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()) @@ -103,7 +109,7 @@ $runInitializeSyslog = true; if (isset($params['facility'])) { - $this->_facility = $this->setFacility($params['facility']); + $this->setFacility($params['facility']); $runInitializeSyslog = false; } @@ -117,7 +123,6 @@ * * @param array|Zend_Config $config * @return Zend_Log_Writer_Syslog - * @throws Zend_Log_Exception */ static public function factory($config) { @@ -176,7 +181,7 @@ * 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) @@ -210,7 +215,7 @@ * Set application name * * @param string $application Application name - * @return void + * @return Zend_Log_Writer_Syslog */ public function setApplicationName($application) { @@ -235,7 +240,7 @@ /** * Write a message to syslog. * - * @param array $event event data + * @param array $event event data * @return void */ protected function _write($event) @@ -252,6 +257,11 @@ $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); } }