[Pkg-nagios-changes] [pkg-icinga2] 01/04: Imported Upstream version 2.3.2

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch debmon-wheezy
in repository pkg-icinga2.

commit d4e0ec3d8bb7901b0fa0fd537696810482af664b
Author: Alexander Wirt <formorer at debian.org>
Date:   Thu Mar 12 16:04:53 2015 +0100

    Imported Upstream version 2.3.2
---
 ChangeLog                | 10 ++++++++++
 INSTALL.md               |  4 ++--
 doc/1-about.md           | 10 ++++++++++
 icinga2.spec             |  2 +-
 lib/base/application.cpp |  8 ++------
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a62ae0b..19d2fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,16 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.3.2
+
+#### Changes
+
+* Bugfixes
+
+#### Issues
+
+* Bug 8721: Log message for cli commands breaks the init script
+
 ### What's New in Version 2.3.1
 
 #### Changes
diff --git a/INSTALL.md b/INSTALL.md
index ff5f7e9..480677a 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -112,12 +112,12 @@ disable the usage of `git describe`.
 
 Use `git archive` to build the release tarball:
 
-    $ VERSION=2.3.1
+    $ VERSION=2.3.2
     $ git archive --format=tar --prefix=icinga2-$VERSION/ tags/v$VERSION | gzip >icinga2-$VERSION.tar.gz
 
 Finally you should verify that the tarball only contains the files it should contain:
 
-    $ VERSION=2.3.1
+    $ VERSION=2.3.2
     $ tar ztf icinga2-$VERSION.tar.gz | less
 
 
diff --git a/doc/1-about.md b/doc/1-about.md
index 05fe793..7acbe2c 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,16 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.3.2
+
+#### Changes
+
+* Bugfixes
+
+#### Issues
+
+* Bug 8721: Log message for cli commands breaks the init script
+
 ### What's New in Version 2.3.1
 
 #### Changes
diff --git a/icinga2.spec b/icinga2.spec
index 9241f3a..567afaf 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.3.1
+Version: 2.3.2
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 4d72652..ca0c338 100644
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -106,12 +106,6 @@ Application::~Application(void)
 
 void Application::Exit(int rc)
 {
-	if (rc)
-		Log(LogCritical, "Application")
-		    << "Shutting down after a fatal error; exit code: " << rc;
-	else
-		Log(LogInformation, "Application", "Shutting down...");
-
 	std::cout.flush();
 
 	BOOST_FOREACH(const Logger::Ptr& logger, Logger::GetLoggers()) {
@@ -315,6 +309,8 @@ mainloop:
 		goto mainloop;
 	}
 
+	Log(LogInformation, "Application", "Shutting down...");
+
 	DynamicObject::StopObjects();
 	Application::GetInstance()->OnShutdown();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git