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

Rephrase some log messages 

refs #11122
This commit is contained in:
Jean Flach 2016-02-09 15:53:40 +01:00
parent 674badd3ce
commit fa1d633484
8 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/base/configobject.cpp
View File

@ -258,7 +258,7 @@ void ConfigObject::RestoreAttribute(const String& attr, bool updateVersion)
Value current = newValue;
if (current.IsEmpty())
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot restore non-existing object attribute"));
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot restore non-existent object attribute"));
String prefix = tokens[0];
@ -272,7 +272,7 @@ void ConfigObject::RestoreAttribute(const String& attr, bool updateVersion)
prefix += "." + key;
if (!dict->Contains(key))
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot restore non-existing object attribute"));
BOOST_THROW_EXCEPTION(std::invalid_argument("Cannot restore non-existent object attribute"));
current = dict->Get(key);
}

4
lib/cli/apisetuputility.cpp
View File

@ -85,7 +85,7 @@ bool ApiSetupUtility::SetupMasterCertificates(const String& cn)
if (Utility::PathExists(key)) {
Log(LogInformation, "cli")
<< "Private key file '" << key << "' already existing, skipping.";
<< "Private key file '" << key << "' already exists, not generating new certificate.";
return true;
}
@ -161,7 +161,7 @@ bool ApiSetupUtility::SetupMasterApiUser(void)
if (Utility::PathExists(apiuserspath)) {
Log(LogInformation, "cli")
<< "API user config file '" << apiuserspath << "' already existing, skipping.";
<< "API user config file '" << apiuserspath << "' already exists, not creating config file.";
return true;
}

2
lib/cli/nodesetupcommand.cpp
View File

@ -138,7 +138,7 @@ int NodeSetupCommand::SetupMaster(const boost::program_options::variables_map& v
if (Utility::PathExists(existing_path)) {
Log(LogWarning, "cli")
<< "Certificate '" << existing_path << "' for CN '" << cn << "' already existing. Skipping certificate generation.";
<< "Certificate '" << existing_path << "' for CN '" << cn << "' already exists. Not generating new certificate.";
} else {
Log(LogInformation, "cli")
<< "Certificates not yet generated. Running 'api setup' now.";

8
lib/cli/nodeupdateconfigcommand.cpp
View File

@ -256,7 +256,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
BOOST_FOREACH(const String& object_path, object_paths) {
if (object_path.Contains(host_pattern)) {
Log(LogNotice, "cli")
<< "Host '" << host << "' already existing. Skipping its creation.";
<< "Host '" << host << "' already exists.";
skip_host = true;
break;
}
@ -272,7 +272,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
if (NodeUtility::CheckAgainstBlackAndWhiteList("blacklist", node_name, host, Empty) &&
!NodeUtility::CheckAgainstBlackAndWhiteList("whitelist", node_name, host, Empty)) {
Log(LogWarning, "cli")
<< "Host '" << host << "' on node '" << node_name << "' is blacklisted, but not whitelisted. Skipping.";
<< "Host '" << host << "' on node '" << node_name << "' is blacklisted, but not whitelisted. Not creating host object.";
skip_host = true;
host_was_blacklisted = true; //check this for services on this blacklisted host
}
@ -321,7 +321,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
BOOST_FOREACH(const String& object_path, object_paths) {
if (object_path.Contains(service_pattern)) {
Log(LogNotice, "cli")
<< "Service '" << service << "' on Host '" << host << "' already existing. Skipping its creation.";
<< "Service '" << service << "' on Host '" << host << "' already exists.";
skip_service = true;
break;
}
@ -332,7 +332,7 @@ int NodeUpdateConfigCommand::Run(const boost::program_options::variables_map& vm
!NodeUtility::CheckAgainstBlackAndWhiteList("whitelist", endpoint, host, service)) {
Log(LogWarning, "cli")
<< "Service '" << service << "' on host '" << host << "' on node '"
<< node_name << "' is blacklisted, but not whitelisted. Skipping.";
<< node_name << "' is blacklisted, but not whitelisted. Not creating service object.";
skip_service = true;
}

2
lib/cli/pkiutility.cpp
View File

@ -53,7 +53,7 @@ int PkiUtility::NewCa(void)
if (Utility::PathExists(caCertFile) && Utility::PathExists(caKeyFile)) {
Log(LogCritical, "cli")
<< "CA files '" << caCertFile << "' and '" << caKeyFile << "'already exist.";
<< "CA files '" << caCertFile << "' and '" << caKeyFile << "' already exist.";
return 1;
}

9
lib/cli/repositoryutility.cpp
View File

@ -612,18 +612,15 @@ void RepositoryUtility::CommitChange(const Dictionary::Ptr& change, const String
String command = change->Get("command");
Dictionary::Ptr attrs;
if (change->Contains("attrs")) {
if (change->Contains("attrs"))
attrs = change->Get("attrs");
}
bool success = false;
if (command == "add") {
if (command == "add")
success = AddObjectInternal(name, type, attrs);
}
else if (command == "remove") {
else if (command == "remove")
success = RemoveObjectInternal(name, type, attrs);
}
if (success) {
Log(LogNotice, "cli")

2
lib/remote/apilistener-configsync.cpp
View File

@ -240,7 +240,7 @@ Value ApiListener::ConfigDeleteObjectAPIHandler(const MessageOrigin::Ptr& origin
if (!object) {
Log(LogNotice, "ApiListener")
<< "Could not delete non-existing object '" << params->Get("name") << "'.";
<< "Could not delete non-existent object '" << params->Get("name") << "'.";
return Empty;
}

2
lib/remote/configpackageutility.cpp
View File

@ -107,7 +107,7 @@ String ConfigPackageUtility::CreateStage(const String& packageName, const Dictio
Log(LogInformation, "ConfigPackageUtility")
<< "Updating configuration file: " << filePath;
//pass the directory and generate a dir tree, if not existing already
// Pass the directory and generate a dir tree, if it does not already exist
Utility::MkDirP(Utility::DirName(filePath), 0750);
std::ofstream fp(filePath.CStr(), std::ofstream::out | std::ostream::binary | std::ostream::trunc);
fp << kv.second;