shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Feature #1739: Minor changes (code style, error message readability)

Browse Source
This commit is contained in:
Carlos Martín 2013-02-18 14:25:48 +01:00
parent b84a0350a7
commit 69b4cfc083
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/host/Host.cc
View File

@ -203,7 +203,7 @@ int Host::update_info(string &parse_str,
ostringstream ess;
ess << "Error parsing host information: " << error_msg
<< "Monitoring information: " << parse_str;
<< ". Monitoring information: " << endl << parse_str;
NebulaLog::log("ONE", Log::ERROR, ess);

22
src/im/InformationManagerDriver.cc
View File

@ -119,11 +119,11 @@ void InformationManagerDriver::protocol(
host->error_info(*hinfo, vm_ids);
Nebula &ne = Nebula::instance();
LifeCycleManager *lcm = ne.get_lcm();
for (set<int>::iterator it = vm_ids.begin(); it != vm_ids.end(); it++)
{
Nebula &ne = Nebula::instance();
LifeCycleManager *lcm = ne.get_lcm();
lcm->trigger(LifeCycleManager::MONITOR_DONE, *it);
}
@ -137,19 +137,17 @@ void InformationManagerDriver::protocol(
rc = host->update_info(*hinfo, vm_poll, lost, found);
delete hinfo;
hpool->update(host);
if (rc != 0)
{
delete hinfo;
hpool->update(host);
host->unlock();
return;
}
delete hinfo;
hpool->update(host);
hpool->update_monitoring(host);
ess << "Host " << host->get_name() << " (" << host->get_oid() << ")"
@ -164,11 +162,11 @@ void InformationManagerDriver::protocol(
set<int>::iterator its;
map<int,string>::iterator itm;
Nebula &ne = Nebula::instance();
LifeCycleManager *lcm = ne.get_lcm();
for (its = lost.begin(); its != lost.end(); its++)
{
Nebula &ne = Nebula::instance();
LifeCycleManager *lcm = ne.get_lcm();
lcm->trigger(LifeCycleManager::MONITOR_DONE, *its);
}