Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-11 00:39:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed bootstrapping of Tor in retroshare-service

Browse source
This commit is contained in:
csoler 2021-07-02 00:11:10 +02:00
parent da86da29ff
commit ae79261cbc
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libretroshare/src/rsserver/rsinit.cc
View file

@ -35,6 +35,8 @@
# include <QString> // for QString::fromStdString(...) # include <QString> // for QString::fromStdString(...)
#endif #endif
#include <QCoreApplication>
#include "util/argstream.h" #include "util/argstream.h"
#include "util/rsdebug.h" #include "util/rsdebug.h"
#include "util/rsdir.h" #include "util/rsdir.h"
@ -1960,6 +1962,9 @@ bool RsInit::startAutoTor()
std::cerr << "(EE) Tor hidden service cannot be started: " << error_msg << std::endl; std::cerr << "(EE) Tor hidden service cannot be started: " << error_msg << std::endl;
return false; return false;
} }
// process Qt event loop to deal with messages of online/offline info
QCoreApplication::processEvents();
} }
return true; return true;
} }

5
libretroshare/src/tor/TorManager.cpp
View file

@ -357,6 +357,11 @@ bool TorManager::start()
emit configurationNeededChanged(); emit configurationNeededChanged();
} }
std::cerr << "Starting Tor process:" << std::endl;
std::cerr << " Tor executable path: " << executable.toStdString() << std::endl;
std::cerr << " Tor data directory : " << d->dataDir.toStdString() << std::endl;
std::cerr << " Tor default torrc : " << defaultTorrc.toStdString() << std::endl;
d->process->setExecutable(executable); d->process->setExecutable(executable);
d->process->setDataDir(d->dataDir); d->process->setDataDir(d->dataDir);
d->process->setDefaultTorrc(defaultTorrc); d->process->setDefaultTorrc(defaultTorrc);