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

Bugfixes for the type validation feature.

This commit is contained in:
Gunnar Beutner 2013-02-02 19:56:23 +01:00
parent 33aba14197
commit 628d8374c7
3 changed files with 82 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
itl/types.conf
View File

@ -34,7 +34,7 @@ type Component {
} }
type Logger { type Logger {
string type, string "type",
string path, string path,
string severity string severity
} }
@ -71,7 +71,7 @@ type IcingaApplication {
string service, string service,
string pid_path, string pid_path,
string state_path, string state_path,
string macros dictionary macros
} }
type Service { type Service {
@ -104,5 +104,8 @@ type ServiceGroup {
type Endpoint { type Endpoint {
string node, string node,
string service, string service,
number local number "local"
}
type TimePeriod {
} }

4
lib/config/configtype.cpp
View File

@ -62,8 +62,8 @@ void ConfigType::ValidateObject(const DynamicObject::Ptr& object) const
continue; continue;
if (!ValidateAttribute(it->first, it->second.Data)) if (!ValidateAttribute(it->first, it->second.Data))
Logger::Write(LogWarning, "base", "Configuration attribute '" + it->first + Logger::Write(LogWarning, "config", "Configuration attribute '" + it->first +
"' on object '" + object->GetName() + "' of type '" + object->GetType()->GetName() + "' is unknown."); "' on object '" + object->GetName() + "' of type '" + object->GetType()->GetName() + "' is unknown or contains an invalid type.");
} }
} }

3
lib/config/typerule.cpp
View File

@ -36,6 +36,9 @@ bool TypeRule::Matches(const String& name, const Value& value) const
if (!Utility::Match(m_NamePattern, name)) if (!Utility::Match(m_NamePattern, name))
return false; return false;
if (value.IsEmpty())
return true;
switch (m_Type) { switch (m_Type) {
case TypeAny: case TypeAny:
return true; return true;