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

Replace spaces with tabs

This commit is contained in:
Gunnar Beutner 2015-01-27 10:50:15 +01:00
parent e7938c9374
commit a11cdbdc39
8 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/compat/statusdatawriter.cpp
View File

@ -684,7 +684,7 @@ void StatusDataWriter::UpdateObjectsCache(void)
tempobjectfp << "\t" "members" "\t"; tempobjectfp << "\t" "members" "\t";
DumpNameList(tempobjectfp, ug->GetMembers()); DumpNameList(tempobjectfp, ug->GetMembers());
tempobjectfp << "\n" tempobjectfp << "\n"
"\t" "}" "\n"; "\t" "}" "\n";
objectfp << tempobjectfp.str(); objectfp << tempobjectfp.str();
} }

3
lib/config/configcompilercontext.cpp
View File

@ -76,7 +76,6 @@ void ConfigCompilerContext::FinishObjectsFile(void)
<< boost::errinfo_api_function("rename") << boost::errinfo_api_function("rename")
<< boost::errinfo_errno(errno) << boost::errinfo_errno(errno)
<< boost::errinfo_file_name(tempFilename)); << boost::errinfo_file_name(tempFilename));
} }
} }

4
lib/icinga/icinga-type.conf
View File

@ -57,7 +57,7 @@
%attribute %string "icon_image", %attribute %string "icon_image",
%attribute %string "icon_image_alt", %attribute %string "icon_image_alt",
%attribute %name(Endpoint) "command_endpoint", %attribute %name(Endpoint) "command_endpoint",
} }
%type Host %inherits Checkable { %type Host %inherits Checkable {
@ -139,7 +139,7 @@
%attribute %number "*" %attribute %number "*"
}, },
%attribute %name(Endpoint) "command_endpoint", %attribute %name(Endpoint) "command_endpoint",
} }
%type User { %type User {

12
lib/livestatus/commentstable.cpp
View File

@ -98,9 +98,9 @@ Object::Ptr CommentsTable::HostAccessor(const Value& row, const Column::ObjectAc
Checkable::Ptr checkable = Checkable::GetOwnerByCommentID(comment->GetId()); Checkable::Ptr checkable = Checkable::GetOwnerByCommentID(comment->GetId());
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
return host; return host;
} }
@ -111,9 +111,9 @@ Object::Ptr CommentsTable::ServiceAccessor(const Value& row, const Column::Objec
Checkable::Ptr checkable = Checkable::GetOwnerByCommentID(comment->GetId()); Checkable::Ptr checkable = Checkable::GetOwnerByCommentID(comment->GetId());
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
return service; return service;
} }

12
lib/livestatus/downtimestable.cpp
View File

@ -98,9 +98,9 @@ Object::Ptr DowntimesTable::HostAccessor(const Value& row, const Column::ObjectA
Checkable::Ptr checkable = Checkable::GetOwnerByDowntimeID(downtime->GetId()); Checkable::Ptr checkable = Checkable::GetOwnerByDowntimeID(downtime->GetId());
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
return host; return host;
} }
@ -111,9 +111,9 @@ Object::Ptr DowntimesTable::ServiceAccessor(const Value& row, const Column::Obje
Checkable::Ptr checkable = Checkable::GetOwnerByDowntimeID(downtime->GetId()); Checkable::Ptr checkable = Checkable::GetOwnerByDowntimeID(downtime->GetId());
Host::Ptr host; Host::Ptr host;
Service::Ptr service; Service::Ptr service;
tie(host, service) = GetHostService(checkable); tie(host, service) = GetHostService(checkable);
return service; return service;
} }

2
lib/methods/plugineventtask.hpp
View File

@ -36,7 +36,7 @@ class I2_METHODS_API PluginEventTask
{ {
public: public:
static void ScriptFunc(const Checkable::Ptr& service, static void ScriptFunc(const Checkable::Ptr& service,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
private: private:
PluginEventTask(void); PluginEventTask(void);

2
lib/methods/pluginnotificationtask.hpp
View File

@ -39,7 +39,7 @@ public:
static void ScriptFunc(const Notification::Ptr& notification, static void ScriptFunc(const Notification::Ptr& notification,
const User::Ptr& user, const CheckResult::Ptr& cr, int itype, const User::Ptr& user, const CheckResult::Ptr& cr, int itype,
const String& author, const String& comment, const String& author, const String& comment,
const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros); const Dictionary::Ptr& resolvedMacros, bool useResolvedMacros);
private: private:
PluginNotificationTask(void); PluginNotificationTask(void);

6
lib/perfdata/perfdata-type.conf
View File

@ -35,8 +35,8 @@
} }
%type GelfWriter { %type GelfWriter {
%attribute %string "host", %attribute %string "host",
%attribute %string "port", %attribute %string "port",
%attribute %string "source" %attribute %string "source"
} }