Browse Source

tweaked debug logging in i2pd_qt

pull/1412/head
kote 5 years ago
parent
commit
b5aa67b491
  1. 12
      qt/i2pd_qt/DaemonQT.cpp
  2. 2
      qt/i2pd_qt/logviewermanager.cpp

12
qt/i2pd_qt/DaemonQT.cpp

@ -11,6 +11,8 @@
#include <QMutexLocker> #include <QMutexLocker>
#include <QThread> #include <QThread>
//#define DEBUG_WITH_DEFAULT_LOGGING (1)
namespace i2p namespace i2p
{ {
namespace qt namespace qt
@ -151,10 +153,16 @@ namespace qt
int result; int result;
{ {
std::shared_ptr<std::iostream> logstreamptr=std::make_shared<std::stringstream>(); std::shared_ptr<std::iostream> logstreamptr=
#ifdef DEBUG_WITH_DEFAULT_LOGGING
nullptr
#else
std::make_shared<std::stringstream>()
#endif
;
//TODO move daemon init deinit to a bg thread //TODO move daemon init deinit to a bg thread
DaemonQTImpl daemon; DaemonQTImpl daemon;
(*logstreamptr) << "Initialising the daemon..." << std::endl; if(logstreamptr) (*logstreamptr) << "Initialising the daemon..." << std::endl;
bool daemonInitSuccess = daemon.init(argc, argv, logstreamptr); bool daemonInitSuccess = daemon.init(argc, argv, logstreamptr);
if(!daemonInitSuccess) if(!daemonInitSuccess)
{ {

2
qt/i2pd_qt/logviewermanager.cpp

@ -18,7 +18,7 @@ namespace logviewer {
QString Worker::pollAndShootATimerForInfiniteRetries() { QString Worker::pollAndShootATimerForInfiniteRetries() {
std::shared_ptr<std::iostream> logStream=logViewerManager.getLogStream(); std::shared_ptr<std::iostream> logStream=logViewerManager.getLogStream();
assert(logStream!=nullptr); if(!logStream)return "";
std::streamsize MAX_SZ=64*1024; std::streamsize MAX_SZ=64*1024;
char*buf=(char*)malloc(MAX_SZ*sizeof(char)); char*buf=(char*)malloc(MAX_SZ*sizeof(char));
if(buf==nullptr)return ""; if(buf==nullptr)return "";

Loading…
Cancel
Save