mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-20 10:50:08 +03:00
Feature #687: Fix segmentation fault, making the RM the last manager to be initialized
This commit is contained in:
parent
655d9f4a29
commit
2d46c59812
@ -446,28 +446,6 @@ void Nebula::start()
|
||||
throw runtime_error("Could not start the Dispatch Manager");
|
||||
}
|
||||
|
||||
// ---- Request Manager ----
|
||||
try
|
||||
{
|
||||
int rm_port = 0;
|
||||
|
||||
nebula_configuration->get("PORT", rm_port);
|
||||
|
||||
rm = new RequestManager(rm_port, log_location + "one_xmlrpc.log");
|
||||
}
|
||||
catch (bad_alloc&)
|
||||
{
|
||||
NebulaLog::log("ONE", Log::ERROR, "Error starting RM");
|
||||
throw;
|
||||
}
|
||||
|
||||
rc = rm->start();
|
||||
|
||||
if ( rc != 0 )
|
||||
{
|
||||
throw runtime_error("Could not start the Request Manager");
|
||||
}
|
||||
|
||||
// ---- Hook Manager ----
|
||||
try
|
||||
{
|
||||
@ -559,6 +537,28 @@ void Nebula::start()
|
||||
throw runtime_error("Could not start the Image Manager");
|
||||
}
|
||||
|
||||
// ---- Request Manager ----
|
||||
try
|
||||
{
|
||||
int rm_port = 0;
|
||||
|
||||
nebula_configuration->get("PORT", rm_port);
|
||||
|
||||
rm = new RequestManager(rm_port, log_location + "one_xmlrpc.log");
|
||||
}
|
||||
catch (bad_alloc&)
|
||||
{
|
||||
NebulaLog::log("ONE", Log::ERROR, "Error starting RM");
|
||||
throw;
|
||||
}
|
||||
|
||||
rc = rm->start();
|
||||
|
||||
if ( rc != 0 )
|
||||
{
|
||||
throw runtime_error("Could not start the Request Manager");
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------
|
||||
// Load mads
|
||||
// -----------------------------------------------------------
|
||||
|
Loading…
x
Reference in New Issue
Block a user