parent
d1897efa8b
commit
60e71aad38
3 changed files with 7 additions and 8 deletions
|
|
@ -232,7 +232,7 @@ void ClientApp::scheduleClientRestart(double retryTime)
|
||||||
|
|
||||||
void ClientApp::handleClientConnected() const
|
void ClientApp::handleClientConnected() const
|
||||||
{
|
{
|
||||||
LOG_NOTE("connected to server");
|
LOG_IPC("connected to server");
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClientApp::handleClientFailed(const Event &e)
|
void ClientApp::handleClientFailed(const Event &e)
|
||||||
|
|
@ -267,7 +267,7 @@ void ClientApp::handleClientRefused(const Event &e)
|
||||||
|
|
||||||
void ClientApp::handleClientDisconnected()
|
void ClientApp::handleClientDisconnected()
|
||||||
{
|
{
|
||||||
LOG_NOTE("disconnected from server");
|
LOG_IPC("disconnected from server");
|
||||||
if (!args().m_restartable) {
|
if (!args().m_restartable) {
|
||||||
getEvents()->addEvent(Event(EventTypes::Quit));
|
getEvents()->addEvent(Event(EventTypes::Quit));
|
||||||
} else if (!m_suspended) {
|
} else if (!m_suspended) {
|
||||||
|
|
|
||||||
|
|
@ -440,7 +440,7 @@ bool ServerApp::startServer()
|
||||||
listener->setServer(m_server);
|
listener->setServer(m_server);
|
||||||
m_server->setListener(listener);
|
m_server->setListener(listener);
|
||||||
m_listener = listener;
|
m_listener = listener;
|
||||||
LOG_NOTE("started server, waiting for clients");
|
LOG_IPC("started server, waiting for clients");
|
||||||
m_serverState = Started;
|
m_serverState = Started;
|
||||||
return true;
|
return true;
|
||||||
} catch (SocketAddressInUseException &e) {
|
} catch (SocketAddressInUseException &e) {
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
|
|
||||||
#include "CoreProcess.h"
|
#include "CoreProcess.h"
|
||||||
|
|
||||||
|
#include "base/Log.h"
|
||||||
#include "common/ExitCodes.h"
|
#include "common/ExitCodes.h"
|
||||||
#include "common/Settings.h"
|
#include "common/Settings.h"
|
||||||
#include "gui/ipc/DaemonIpcClient.h"
|
#include "gui/ipc/DaemonIpcClient.h"
|
||||||
|
|
@ -203,16 +204,14 @@ void CoreProcess::onProcessFinished(int exitCode, QProcess::ExitStatus)
|
||||||
m_retryTimer.stop();
|
m_retryTimer.stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (exitCode == s_exitSuccess) {
|
if (exitCode == s_exitDuplicate) {
|
||||||
qDebug("desktop process exited normally");
|
|
||||||
} else if (exitCode != s_exitDuplicate) {
|
|
||||||
qWarning("desktop process exited with error code: %d", exitCode);
|
|
||||||
} else {
|
|
||||||
setProcessState(ProcessState::Stopped);
|
setProcessState(ProcessState::Stopped);
|
||||||
qWarning("desktop process is already running");
|
qWarning("desktop process is already running");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOG_IPC("desktop process exited with code: %d", exitCode);
|
||||||
|
|
||||||
if (const auto wasStarted = m_processState == ProcessState::Started; wasStarted) {
|
if (const auto wasStarted = m_processState == ProcessState::Started; wasStarted) {
|
||||||
qDebug("desktop process was running, retrying in %d ms", kRetryDelay);
|
qDebug("desktop process was running, retrying in %d ms", kRetryDelay);
|
||||||
setProcessState(ProcessState::RetryPending);
|
setProcessState(ProcessState::RetryPending);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue