shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-02-22 17:57:46 +03:00
Code Releases Wiki Activity

Merge branch 'feature-307' of git@opennebula.org:one into feature-307

Browse Source
This commit is contained in:
Jaime Melis 2010-08-31 10:48:17 +02:00
commit 8a10b3ed0a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/nebula/Nebula.cc
View File

@ -64,6 +64,15 @@ void Nebula::start()
throw runtime_error("Could not load nebula configuration file.");
}
string config_fname = log_location + "config";
ofstream config_file(config_fname.c_str(), ios_base::trunc & ios_base::out);
if (config_file.fail() == false)
{
config_file << *nebula_configuration << endl;
config_file.close();
}
// -----------------------------------------------------------
// Log system
// -----------------------------------------------------------
@ -109,10 +118,9 @@ void Nebula::start()
NebulaLog::log("ONE",Log::INFO,"----------------------------------------");
os.str("");
os << "\n--------------------------------------------";
os << "\n----------------------------------\n";
os << *nebula_configuration;
os << "\n--------------------------------------------";
os << "----------------------------------";
NebulaLog::log("ONE",Log::INFO,os);

2
src/template/Template.cc
View File

@ -367,7 +367,7 @@ string& Template::to_str(string& str) const
{
s = it->second->marshall(",");
os << endl << "\t" << it->first << separator << *s;
os << it->first << separator << *s << endl;
delete s;
}