mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

better handling of appender streams that couldn't be created (e.g. due to lack of permissions)

metadata
Wenzel Jakob 2012-10-10 19:59:05 -07:00
parent f6919a34c1
commit 426015756c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libcore/appender.cpp
View File

@ -41,11 +41,15 @@ StreamAppender::StreamAppender(const std::string &filename)
void StreamAppender::readLog(std::string &target) { void StreamAppender::readLog(std::string &target) {
Assert(m_isFile); Assert(m_isFile);
std::fstream &stream = * ((std::fstream *) m_stream); std::fstream &stream = * ((std::fstream *) m_stream);
if (!stream.good()) {
target = "";
return;
}
stream.flush(); stream.flush();
stream.seekg(0, std::ios::end); stream.seekg(0, std::ios::end);
std::streamoff size = stream.tellg(); std::streamoff size = stream.tellg();
if (size == 0) { if (stream.fail() || size == 0) {
target.clear(); target = "";
return; return;
} }
target.resize((size_t) size); target.resize((size_t) size);
@ -62,7 +66,7 @@ void StreamAppender::readLog(std::string &target) {
void StreamAppender::append(ELogLevel level, const std::string &text) { void StreamAppender::append(ELogLevel level, const std::string &text) {
/* Insert a newline if the last message was a progress message */ /* Insert a newline if the last message was a progress message */
if (m_lastMessageWasProgress && !m_isFile) if (m_lastMessageWasProgress && !m_isFile)
std::cout << endl; (*m_stream) << endl;
(*m_stream) << text << endl; (*m_stream) << text << endl;
m_lastMessageWasProgress = false; m_lastMessageWasProgress = false;
} }
@ -70,8 +74,8 @@ void StreamAppender::append(ELogLevel level, const std::string &text) {
void StreamAppender::logProgress(Float progress, const std::string &name, void StreamAppender::logProgress(Float progress, const std::string &name,
const std::string &formatted, const std::string &eta, const void *ptr) { const std::string &formatted, const std::string &eta, const void *ptr) {
if (!m_isFile) { if (!m_isFile) {
std::cout << formatted; (*m_stream) << formatted;
std::cout.flush(); m_stream->flush();
} }
m_lastMessageWasProgress = true; m_lastMessageWasProgress = true;
} }