Jordi Boggiano 15 лет назад
Родитель
Сommit
78d60f9dce
2 измененных файлов с 36 добавлено и 39 удалено
  1. 28 29
      src/Monolog/Handler/SyslogHandler.php
  2. 8 10
      tests/Monolog/Handler/SyslogHandlerTest.php

+ 28 - 29
src/Monolog/Handler/SyslogHandler.php

@@ -16,7 +16,7 @@ use Monolog\Logger;
 
 /**
  * Logs to syslog service.
- * 
+ *
  * usage example:
  *
  *   $log = new Logger('application');
@@ -29,42 +29,41 @@ use Monolog\Logger;
  */
 class SyslogHandler extends AbstractHandler
 {
-
     /**
      * Translate Monolog log levels to syslog log priorities.
      */
     private $logLevels = array(
-      Logger::DEBUG   => LOG_DEBUG,
-      Logger::INFO    => LOG_INFO,
-      Logger::WARNING => LOG_WARNING,
-      Logger::ERROR   => LOG_ERR,
+        Logger::DEBUG   => LOG_DEBUG,
+        Logger::INFO    => LOG_INFO,
+        Logger::WARNING => LOG_WARNING,
+        Logger::ERROR   => LOG_ERR,
     );
-  
+
     /**
      * List of valid log facility names.
      */
     private $facilities = array(
-      'auth'     => LOG_AUTH,
-      'authpriv' => LOG_AUTHPRIV,
-      'cron'     => LOG_CRON,
-      'daemon'   => LOG_DAEMON,
-      'kern'     => LOG_KERN,
-      'local0'   => LOG_LOCAL0,
-      'local1'   => LOG_LOCAL1,
-      'local2'   => LOG_LOCAL2,
-      'local3'   => LOG_LOCAL3,
-      'local4'   => LOG_LOCAL4,
-      'local5'   => LOG_LOCAL5,
-      'local6'   => LOG_LOCAL6,
-      'local7'   => LOG_LOCAL7,
-      'lpr'      => LOG_LPR,
-      'mail'     => LOG_MAIL,
-      'news'     => LOG_NEWS,
-      'syslog'   => LOG_SYSLOG,
-      'user'     => LOG_USER,
-      'uucp'     => LOG_UUCP,
+        'auth'     => LOG_AUTH,
+        'authpriv' => LOG_AUTHPRIV,
+        'cron'     => LOG_CRON,
+        'daemon'   => LOG_DAEMON,
+        'kern'     => LOG_KERN,
+        'local0'   => LOG_LOCAL0,
+        'local1'   => LOG_LOCAL1,
+        'local2'   => LOG_LOCAL2,
+        'local3'   => LOG_LOCAL3,
+        'local4'   => LOG_LOCAL4,
+        'local5'   => LOG_LOCAL5,
+        'local6'   => LOG_LOCAL6,
+        'local7'   => LOG_LOCAL7,
+        'lpr'      => LOG_LPR,
+        'mail'     => LOG_MAIL,
+        'news'     => LOG_NEWS,
+        'syslog'   => LOG_SYSLOG,
+        'user'     => LOG_USER,
+        'uucp'     => LOG_UUCP,
     );
-  
+
     public function __construct($ident, $facility = LOG_USER, $level = Logger::DEBUG, $bubble = true)
     {
         parent::__construct($level, $bubble);
@@ -73,11 +72,11 @@ class SyslogHandler extends AbstractHandler
         if (array_key_exists(strtolower($facility), $this->facilities)) {
             $facility = $this->facilities[strtolower($facility)];
         } else if (!in_array($facility, array_values($this->facilities), true)) {
-            throw new \UnexpectedValueException('unknown facility value "'.$facility.'" given');
+            throw new \UnexpectedValueException('Unknown facility value "'.$facility.'" given');
         }
 
         if (!openlog($ident, LOG_PID, $facility)) {
-            throw new \LogicException('can\'t open syslog for ident "'.$ident.'" and facility "'.$facility.'"'); 
+            throw new \LogicException('Can\'t open syslog for ident "'.$ident.'" and facility "'.$facility.'"');
         }
     }
 

+ 8 - 10
tests/Monolog/Handler/SyslogHandlerTest.php

@@ -17,21 +17,19 @@ class SyslogHandlerTest extends \PHPUnit_Framework_TestCase
 {
     public function testConstruct()
     {
-      $handler = new SyslogHandler('test');
-      $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
+        $handler = new SyslogHandler('test');
+        $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
 
-      $handler = new SyslogHandler('test', LOG_LOCAL1);
-      $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
-
-      $handler = new SyslogHandler('test', 'local1');
-      $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
+        $handler = new SyslogHandler('test', LOG_LOCAL1);
+        $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
 
+        $handler = new SyslogHandler('test', 'local1');
+        $this->assertInstanceOf('Monolog\Handler\SyslogHandler', $handler);
     }
 
     public function testConstructInvalidFacility()
     {
-      $this->setExpectedException('UnexpectedValueException');
-      $handler = new SyslogHandler('test', 'unknown');
+        $this->setExpectedException('UnexpectedValueException');
+        $handler = new SyslogHandler('test', 'unknown');
     }
-
 }