Move setting of filePath to its own setter. Include a check to see if extension is provided in filename, otherwise add it

1 files changed, 17 insertions, 6 deletions

diff --git a/src/Logger.php b/src/Logger.php
index a4cd28e..17bd3bb 100755
--- a/src/Logger.php
+++ b/src/Logger.php
@@ -121,12 +121,7 @@ class Logger extends AbstractLogger
             $this->setLogToStdOut($logDirectory);

             $this->setFileHandle('w+');

         } else {

-            if ($this->options['filename']) {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

-            } else {

-                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

-            }

-

+            $this->setLogFilePath($logDirectory);

             if(file_exists($this->logFilePath) && !is_writable($this->logFilePath)) {

                 throw new RuntimeException('The file could not be written to. Check that appropriate permissions have been set.');

             }

@@ -149,6 +144,22 @@ class Logger extends AbstractLogger
     }

 

     /**

+     * @param string $logDirectory

+     */

+    public function setLogFilePath($logDirectory) {

+        if ($this->options['filename']) {

+            if (strpos($this->options['filename'], '.log') !== false || strpos($this->options['filename'], '.txt') !== false) {

+                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'];

+            }

+            else {

+                $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['filename'].'.'.$this->options['extension'];

+            }

+        } else {

+            $this->logFilePath = $logDirectory.DIRECTORY_SEPARATOR.$this->options['prefix'].date('Y-m-d').'.'.$this->options['extension'];

+        }

+    }

+

+    /**

      * @param $writeMode

      *

      * @internal param resource $fileHandle