Merge pull request #45 from nook24/watchdog

Watchdog
nook24 · Sep 6, 2018 · 7d9aa45 · 7d9aa45
2 parents e234866 + 3247b3b
commit 7d9aa45
Show file tree

Hide file tree

Showing 6 changed files with 193 additions and 74 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ statusengine-naemon-1-0-3.o
 statusengine-nagios.o
 statusengine-naemon.o
 ._*
+.nfs*
diff --git a/README.md b/README.md
@@ -108,6 +108,11 @@ Check the documentation for the [migration guide](https://statusengine.org/getti
 - PHP7.2
 
 ## Changelog
+**2.2.0**
+- Restart dead childs in case of database errors [#44](https://github.com/nook24/statusengine/pull/44)
+- Fix restart through systemd
+- Thanks to [dhoffend](https://github.com/dhoffend)
+
 **2.1.5**
 - Remove bulk insert debug messages
 - Fix a bug where downtimes got reset on nagios/naemon restart in downtimehistory table

diff --git a/cakephp/app/Config/bootstrap.php b/cakephp/app/Config/bootstrap.php
@@ -108,7 +108,7 @@
 CakePlugin::load('BoostCake');
 
 //Define versions
-define('STATUSENIGNE_VERSION', '2.1.5');
+define('STATUSENIGNE_VERSION', '2.2.0');
 define('PERFDATA_VERSION', '1.2.0');
 
 

diff --git a/cakephp/app/Config/core.php b/cakephp/app/Config/core.php
@@ -405,6 +405,7 @@
 CakeLog::config('default', array(
 	'engine' => 'Syslog',
 	'prefix' => 'statusengine',
+	'flag' => LOG_ODELAY | LOG_PID,
 	'types' => array('emergency', 'alert', 'critical', 'error', 'warning', 'notice', 'info'),
 ));