yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Other: fix bug in login screen <-> main window transition. [skip ci]

Browse Source 
Other: fixed bug with split mode toggle. [skip ci]

Other: fix QML warnings. [skip ci]

Other: fix showMainWindow gRPC event binding. [skip ci].

QML Fixes [skip ci]

Other: wait for EventStreamReader thread to finish on exit.

Other: made BridgeMonitor generic, as ProcessMonitor. [skip ci]
This commit is contained in:
Xavier Michelon
2022-08-11 11:27:05 +02:00
committed by Jakub
parent 4ed9625959
commit ed904c2bdd
25 changed files with 149 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/frontend/bridge-gui/bridge-gui-tester/main.cpp
View File

@ -19,7 +19,6 @@
#include "MainWindow.h"
#include "AppController.h"
#include "GRPCServerWorker.h"
#include <bridgepp/BridgeUtils.h>
#include <bridgepp/Exception/Exception.h>
#include <bridgepp/Worker/Overseer.h>
@ -58,35 +57,30 @@ int main(int argc, char **argv)
QApplication::setOrganizationDomain("proton.ch");
QApplication::setQuitOnLastWindowClosed(true);
app().log().setEchoInConsole(true);
app().log().info(QString("%1 started.").arg(applicationName));
Log& log = app().log();
log.setEchoInConsole(true);
log.info(QString("%1 started.").arg(applicationName));
MainWindow window(nullptr);
app().setMainWindow(&window);
window.setWindowTitle(QApplication::applicationName());
window.show();
GRPCServerWorker *serverWorker = new GRPCServerWorker(nullptr);
auto *serverWorker = new GRPCServerWorker(nullptr);
QObject::connect(serverWorker, &Worker::started, []() { app().log().info("Server worker started."); });
QObject::connect(serverWorker, &Worker::finished, []() { app().log().info("Server worker finished."); });
QObject::connect(serverWorker, &Worker::error, [](QString const &message) {
throw Exception(QString("gRPC Server encountered an error: %1").arg(message));
});
QObject::connect(serverWorker, &Worker::error, [&](QString const &message) { app().log().error(message); qApp->exit(EXIT_FAILURE); });
UPOverseer overseer = std::make_unique<Overseer>(serverWorker, nullptr);
overseer->startWorker(true);
qint32 const exitCode = QApplication::exec();
serverWorker->stop();
while (!overseer->isFinished())
{
QThread::msleep(10);
}
if (!overseer->wait(5000))
log.warn("gRPC server took too long to finish.");
app().log().info(QString("%1 exiting with code %2.").arg(applicationName).arg(exitCode));
return exitCode;
}
catch (Exception const &e)
{