[#14523] - Removed syslog formatter; Corrected logging under syslog

phalcon · Nov 11, 2019 · 339333e · 339333e
1 parent 4f2d159
commit 339333e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 169 deletions.
diff --git a/phalcon/Logger/Adapter/Syslog.zep b/phalcon/Logger/Adapter/Syslog.zep
@@ -48,7 +48,7 @@ class Syslog extends AbstractAdapter
      *
      * @var string
      */
-    protected defaultFormatter = "Syslog";
+    protected defaultFormatter = "Line";
 
     /**
      * @var int
@@ -101,15 +101,10 @@ class Syslog extends AbstractAdapter
         bool opened;
 
         let formatter = this->getFormatter(),
-            message   = formatter->format(item);
-
-        if typeof message !== "array" {
-            throw new Exception("The formatted message is not valid");
-        }
-
-        let name     = this->name,
-            facility = this->facility,
-            option   = this->option;
+            message   = formatter->format(item),
+            name      = this->name,
+            facility  = this->facility,
+            option    = this->option;
 
         let result = openlog(name, option, facility);
 
@@ -125,9 +120,9 @@ class Syslog extends AbstractAdapter
 
         let opened       = true,
             this->opened = opened,
-            level        = this->logLevelToSyslog(message[1]);
+            level        = this->logLevelToSyslog(item->getType());
 
-        syslog(level, message[1]);
+        syslog(level, message);
     }
 
     /**

diff --git a/phalcon/Logger/Formatter/Syslog.zep b/phalcon/Logger/Formatter/Syslog.zep
diff --git a/tests/unit/Logger/Formatter/Syslog/FormatCest.php b/tests/unit/Logger/Formatter/Syslog/FormatCest.php
diff --git a/tests/unit/Logger/Formatter/Syslog/InterpolateCest.php b/tests/unit/Logger/Formatter/Syslog/InterpolateCest.php