fix mailtest, small fix on history file, default mail setting value

Slivo-fr · May 21, 2019 · 9317df1 · 9317df1
1 parent 346a561
commit 9317df1
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Settings.php b/Settings.php
@@ -41,7 +41,7 @@ class Settings
      ******************************************************************************************************************/
 
     // Enable sending mails
-    public static $SEND_MAIL = true;
+    public static $SEND_MAIL = false;
 
     // Server configuration
     public static $SMTP_SERVER = 'smtp.example.com';

diff --git a/bin/mailcheck.php b/bin/mailcheck.php
@@ -1,6 +1,7 @@
 <?php
 
-require_once('vendor/autoload.php');
+require_once(__DIR__ . '/../vendor/autoload.php');
+require_once(__DIR__ . '/../Settings.php');
 
 use Killbot\AlertHandler;
 

diff --git a/src/Killbot.php b/src/Killbot.php
@@ -387,7 +387,13 @@ protected function getPendingFiles(): array
     protected function saveKillHistory()
     {
         $this->killHistory = array_slice($this->killHistory, 0, Settings::$KILL_HISTORY_MAX_LENGTH);
-        Utils::writeFile(json_encode($this->killHistory), Utils::getLogPath(), self::KILL_HISTORY_FILENAME, 'w+');
+
+        Utils::writeFile(
+            json_encode($this->killHistory) . PHP_EOL,
+            Utils::getLogPath(),
+            self::KILL_HISTORY_FILENAME,
+            'w+'
+        );
     }
 
     /**
@@ -399,7 +405,7 @@ protected function loadKillHistory()
         $file = Utils::getLogPath().self::KILL_HISTORY_FILENAME;
 
         if (file_exists($file)) {
-            $json = file_get_contents(Utils::getLogPath().self::KILL_HISTORY_FILENAME);
+            $json = file_get_contents(Utils::getLogPath() . self::KILL_HISTORY_FILENAME);
             $this->killHistory = json_decode($json, true);
         }
     }