Skip to content
Permalink
Browse files

Always use errorstream for DEBUG_EXCEPTION_HANDLER

  • Loading branch information
ShadowNinja authored and kwolekr committed Oct 14, 2015
1 parent 4236792 commit 6f4d6cb5741d10e10dacc78e264e421bf6a297cf
Showing with 13 additions and 13 deletions.
  1. +6 −6 src/debug.h
  2. +1 −1 src/emerge.cpp
  3. +1 −1 src/httpfetch.cpp
  4. +1 −1 src/main.cpp
  5. +2 −2 src/network/connection.cpp
  6. +1 −1 src/server.cpp
  7. +1 −1 src/util/thread.h
@@ -126,16 +126,16 @@ class DebugStacker

#if CATCH_UNHANDLED_EXCEPTIONS == 1
#define BEGIN_DEBUG_EXCEPTION_HANDLER try {
#define END_DEBUG_EXCEPTION_HANDLER(logstream) \
} catch (std::exception &e) { \
logstream << "An unhandled exception occurred: " \
<< e.what() << std::endl; \
FATAL_ERROR(e.what()); \
#define END_DEBUG_EXCEPTION_HANDLER \
} catch (std::exception &e) { \
errorstream << "An unhandled exception occurred: " \
<< e.what() << std::endl; \
FATAL_ERROR(e.what()); \
}
#else
// Dummy ones
#define BEGIN_DEBUG_EXCEPTION_HANDLER
#define END_DEBUG_EXCEPTION_HANDLER(logstream)
#define END_DEBUG_EXCEPTION_HANDLER
#endif

#endif // DEBUG_HEADER
@@ -700,6 +700,6 @@ void *EmergeThread::run()
m_server->setAsyncFatalError(err.str());
}

END_DEBUG_EXCEPTION_HANDLER(errorstream)
END_DEBUG_EXCEPTION_HANDLER
return NULL;
}
@@ -677,7 +677,7 @@ class CurlFetchThread : public Thread
else
waitForIO(100);

END_DEBUG_EXCEPTION_HANDLER(errorstream)
END_DEBUG_EXCEPTION_HANDLER
}

// Call curl_multi_remove_handle and cleanup easy handles
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
// Stop httpfetch thread (if started)
httpfetch_cleanup();

END_DEBUG_EXCEPTION_HANDLER(errorstream);
END_DEBUG_EXCEPTION_HANDLER

return retval;
}
@@ -1316,7 +1316,7 @@ void * ConnectionSendThread::run()
/* send non reliable packets */
sendPackets(dtime);

END_DEBUG_EXCEPTION_HANDLER(errorstream);
END_DEBUG_EXCEPTION_HANDLER
}

PROFILE(g_profiler->remove(ThreadIdentifier.str()));
@@ -2097,7 +2097,7 @@ void * ConnectionReceiveThread::run()
}
}
#endif
END_DEBUG_EXCEPTION_HANDLER(errorstream);
END_DEBUG_EXCEPTION_HANDLER
}

PROFILE(g_profiler->remove(ThreadIdentifier.str()));
@@ -112,7 +112,7 @@ void *ServerThread::run()
}
}

END_DEBUG_EXCEPTION_HANDLER(errorstream)
END_DEBUG_EXCEPTION_HANDLER

return NULL;
}
@@ -223,7 +223,7 @@ class UpdateThread : public Thread
doUpdate();
}

END_DEBUG_EXCEPTION_HANDLER(errorstream)
END_DEBUG_EXCEPTION_HANDLER

return NULL;
}

0 comments on commit 6f4d6cb

Please sign in to comment.