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

Remove redundant "Validation failed" prefix from ValidationError exceptions 

ValidationError#ValidationError() already prefixes #m_What,
which #what() returns, with "Validation failed for object".
This commit is contained in:
Alexander A. Klimov 2024-10-23 13:06:12 +02:00
parent c6de69cfe4
commit 7a4ba59961
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/command.cpp
View File

@ -35,7 +35,7 @@ void Command::Validate(int types, const ValidationUtils& utils)
Value argvalue = argdict->Get("value");
if (argvalue.IsString() && !MacroProcessor::ValidateMacroString(argvalue))
BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first, "value" }, "Validation failed: Closing $ not found in macro format string '" + argvalue + "'."));
BOOST_THROW_EXCEPTION(ValidationError(this, { "arguments", kv.first, "value" }, "Closing $ not found in macro format string '" + argvalue + "'."));
}
if (argdict->Contains("set_if")) {

2
lib/icinga/notification.cpp
View File

@ -739,7 +739,7 @@ void Notification::Validate(int types, const ValidationUtils& utils)
Array::Ptr groups = GetUserGroupsRaw();
if ((!users || users->GetLength() == 0) && (!groups || groups->GetLength() == 0))
BOOST_THROW_EXCEPTION(ValidationError(this, std::vector<String>(), "Validation failed: No users/user_groups specified."));
BOOST_THROW_EXCEPTION(ValidationError(this, std::vector<String>(), "No users/user_groups specified."));
}
void Notification::ValidateStates(const Lazy<Array::Ptr>& lvalue, const ValidationUtils& utils)

5
lib/icingadb/icingadb.cpp
View File

@ -48,14 +48,13 @@ void IcingaDB::Validate(int types, const ValidationUtils& utils)
return;
if (GetEnableTls() && GetCertPath().IsEmpty() != GetKeyPath().IsEmpty()) {
BOOST_THROW_EXCEPTION(ValidationError(this, std::vector<String>(), "Validation failed: Either both a client certificate (cert_path) and its private key (key_path) or none of them must be given."));
BOOST_THROW_EXCEPTION(ValidationError(this, std::vector<String>(), "Either both a client certificate (cert_path) and its private key (key_path) or none of them must be given."));
}
try {
InitEnvironmentId();
} catch (const std::exception& e) {
BOOST_THROW_EXCEPTION(ValidationError(this, std::vector<String>(),
String("Validation failed: ") + e.what()));
BOOST_THROW_EXCEPTION(ValidationError(this, std::vector<String>(), e.what()));
}
}