tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revamp livestatus startup logging a bit.

This commit is contained in:
Michael Friedrich 2013-09-28 12:54:26 +02:00
parent 09db65fcd0
commit a326ddbb9f
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/livestatus/listener.cpp
View File

@ -21,11 +21,14 @@
#include "base/objectlock.h"
#include "base/dynamictype.h"
#include "base/logger_fwd.h"
#include "base/exception.h"
#include "base/tcpsocket.h"
#include "base/unixsocket.h"
#include "base/networkstream.h"
#include "base/application.h"
#include <boost/smart_ptr/make_shared.hpp>
#include <boost/exception/diagnostic_information.hpp>
using namespace icinga;
using namespace livestatus;
@ -49,6 +52,7 @@ void LivestatusListener::Start(void)
boost::thread thread(boost::bind(&LivestatusListener::ServerThreadProc, this, socket));
thread.detach();
Log(LogInformation, "livestatus", "Created tcp socket listening on host '" + GetBindHost() + "' port '" + GetBindPort() + "'.");
}
else if (GetSocketType() == "unix") {
#ifndef _WIN32
@ -56,13 +60,18 @@ void LivestatusListener::Start(void)
socket->Bind(GetSocketPath());
/* group must be able to write */
if (chmod(GetSocketPath().CStr(), 0660) < 0) {
Log(LogCritical, "livestatus", "Cannot chmod unix socket '" + GetSocketPath() + "' to 0660: " + strerror(errno));
return;
mode_t mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
if (chmod(GetSocketPath().CStr(), mode) < 0) {
BOOST_THROW_EXCEPTION(posix_error()
<< boost::errinfo_api_function("chmod")
<< boost::errinfo_errno(errno)
<< boost::errinfo_file_name(GetSocketPath()));
}
boost::thread thread(boost::bind(&LivestatusListener::ServerThreadProc, this, socket));
thread.detach();
Log(LogInformation, "livestatus", "Created unix socket in '" + GetSocketPath() + "'.");
#else
/* no unix sockets on windows */
Log(LogCritical, "livestatus", "Unix sockets are not supported on Windows.");

7
contrib/config/mf/icinga2.conf
View File

@ -54,7 +54,6 @@ object PerfdataWriter "pnp" {
/**
* LIVESTATUS
*/
/*
library "livestatus"
object LivestatusListener "livestatus-tcp" {
@ -65,9 +64,9 @@ object LivestatusListener "livestatus-tcp" {
object LivestatusListener "livestatus-unix" {
socket_type = "unix",
socket_path = (Icinga2Prefix + "/var/run/icinga2/livestatus")
socket_path = (Icinga2Prefix + "/var/run/icinga2/rw/livestatus")
}
*/
/**
* IDO
*/
@ -131,7 +130,7 @@ object Host "localhost" {
notifications["mail-michi"] = {
templates = [ "mail-notification" ],
users = [ "michi" ],
groups = [ "all-michis" ],
user_groups = [ "all-michis" ],
notification_period = "24x7",
notification_state_filter = (StateFilterUnknown | StateFilterOK | StateFilterWarning | StateFilterCritical),
notification_type_filter = (NotificationRecovery | NotificationDowntimeStart | NotificationDowntimeEnd),