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

bug #903: Debug Level from oned.conf is now used for VMs

Browse Source
This commit is contained in:
Ruben S. Montero 2012-04-03 18:02:14 +02:00
parent 5657656bf7
commit 58ebcb9b05
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/Nebula.h
View File

@ -156,6 +156,25 @@ public:
// Environment & Configuration
// --------------------------------------------------------------
/**
* Returns the value of DEBUG_LEVEL in oned.conf file
* @return the debug level, to instantiate Log'ers
*/
Log::MessageType get_debug_level() const
{
Log::MessageType clevel = Log::ERROR;
int log_level_int;
nebula_configuration->get("DEBUG_LEVEL", log_level_int);
if (0 <= log_level_int && log_level_int <= 3 )
{
clevel = static_cast<Log::MessageType>(log_level_int);
}
return clevel;
}
/**
* Returns the value of ONE_LOCATION env variable. When this variable is
* not defined the nebula location is "/".

13
src/nebula/Nebula.cc
View File

@ -85,18 +85,11 @@ void Nebula::start()
try
{
string log_fname;
int log_level_int;
Log::MessageType clevel = Log::ERROR;
string log_fname;
Log::MessageType clevel;
log_fname = log_location + "oned.log";
nebula_configuration->get("DEBUG_LEVEL", log_level_int);
if (0 <= log_level_int && log_level_int <= 3 )
{
clevel = static_cast<Log::MessageType>(log_level_int);
}
clevel = get_debug_level();
// Initializing ONE Daemon log system

5
src/vm/VirtualMachine.cc
View File

@ -170,7 +170,10 @@ int VirtualMachine::select(SqlDB * db)
//--------------------------------------------------------------------------
try
{
_log = new FileLog(nd.get_vm_log_filename(oid),Log::DEBUG);
Log::MessageType clevel;
clevel = nd.get_debug_level();
_log = new FileLog(nd.get_vm_log_filename(oid), clevel);
}
catch(exception &e)
{