Whitespace.

This commit is contained in:
Arthur Britto
2012-12-21 13:49:45 -08:00
parent 8f35b78651
commit 401e7e3744
3 changed files with 18 additions and 11 deletions

View File

@@ -124,11 +124,13 @@ void Application::run()
if (theConfig.START_UP == Config::FRESH)
{
cLog(lsINFO) << "Starting new Ledger";
startNewLedger();
}
else if (theConfig.START_UP == Config::LOAD)
{
cLog(lsINFO) << "Loading Old Ledger";
loadOldLedger();
}
else if (theConfig.START_UP == Config::NETWORK)
@@ -251,6 +253,7 @@ void Application::run()
if (theConfig.RUN_STANDALONE)
{
cLog(lsWARNING) << "Running in standalone mode";
mNetOps.setStandAlone();
}
else
@@ -360,4 +363,5 @@ void Application::loadOldLedger()
exit(-1);
}
}
// vim:ts=4

View File

@@ -47,6 +47,7 @@ Log::~Log()
logMsg += " " + mPartitionName + ":";
else
logMsg += " ";
switch (mSeverity)
{
case lsTRACE: logMsg += "TRC "; break;
@@ -57,15 +58,17 @@ Log::~Log()
case lsFATAL: logMsg += "FTL "; break;
case lsINVALID: assert(false); return;
}
logMsg += oss.str();
boost::recursive_mutex::scoped_lock sl(sLock);
if (mSeverity >= sMinSeverity)
std::cerr << logMsg << std::endl;
if (outStream != NULL)
(*outStream) << logMsg << std::endl;
}
std::string Log::rotateLog(void)
{
boost::recursive_mutex::scoped_lock sl(sLock);
@@ -86,11 +89,11 @@ std::string Log::rotateLog(void)
abs_path = boost::filesystem::absolute("");
abs_path /= *pathToLog;
abs_path_str = abs_path.parent_path().string();
out << logRotateCounter;
s = out.str();
abs_new_path_str = abs_path_str + "/" + s + + "_" + pathToLog->filename().string();
abs_new_path_str = abs_path_str + "/" + s + "_" + pathToLog->filename().string();
logRotateCounter++;
@@ -99,17 +102,15 @@ std::string Log::rotateLog(void)
outStream->close();
boost::filesystem::rename(abs_path, boost::filesystem::path(abs_new_path_str));
setLogFile(*pathToLog);
return abs_new_path_str;
}
void Log::setMinSeverity(LogSeverity s, bool all)
{
boost::recursive_mutex::scoped_lock sl(sLock);
sMinSeverity = s;
if (all)
LogPartition::setSeverity(s);
@@ -118,6 +119,7 @@ void Log::setMinSeverity(LogSeverity s, bool all)
LogSeverity Log::getMinSeverity()
{
boost::recursive_mutex::scoped_lock sl(sLock);
return sMinSeverity;
}
@@ -133,7 +135,6 @@ std::string Log::severityToString(LogSeverity s)
case lsFATAL: return "Fatal";
default: assert(false); return "Unknown";
}
}
LogSeverity Log::stringToSeverity(const std::string& s)

View File

@@ -104,3 +104,5 @@ public:
};
#endif
// vim:ts=4