detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-23 01:58:00 +02:00
Code Issues Actions Packages Releases Activity

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-06-11 15:43:24 +02:00
parent cb2c39c62f
commit d3467432a9
2 changed files with 9 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorGui/src/qServer.cpp
View File

@ -1,8 +1,8 @@
#include "qServer.h"
#include "qDefs.h"
#include "qDetectorMain.h"
#include "ServerSocket.h"
#include "multiSlsDetector.h"
#include "string_utils.h"
#include <iostream>
@ -10,7 +10,7 @@
#include <future>
qServer::qServer(qDetectorMain *t)
: threadRunning(false), threadStarted(false), mainTab(t),
: guiServerRunning(false), threadStarted(false), mainTab(t),
controlPort(DEFAULT_GUI_PORTNO), stopPort(DEFAULT_GUI_PORTNO + 1),
controlSocket(nullptr), stopSocket(nullptr) {
FILE_LOG(logDEBUG) << "Client Server ready";
@ -52,7 +52,7 @@ int qServer::DecodeFunction(ServerSocket *sock) {
}
void qServer::ShutDownSockets() {
threadRunning = false;
guiServerRunning = false;
if (controlSocket) {
controlSocket->shutDownSocket();
delete controlSocket;
@ -66,9 +66,9 @@ void qServer::ShutDownSockets() {
}
void qServer::CreateServers() {
if (!threadRunning) {
if (!guiServerRunning) {
FILE_LOG(logINFO) << "Starting Gui Servers";
threadRunning = true;
guiServerRunning = true;
try {
// start control server
@ -91,7 +91,7 @@ void qServer::CreateServers() {
}
void qServer::DestroyServers() {
if (threadRunning) {
if (guiServerRunning) {
FILE_LOG(logINFO) << "Stopping Gui Servers";
ShutDownSockets();
FILE_LOG(logDEBUG) << "Server threads stopped successfully.";
@ -101,11 +101,11 @@ void qServer::DestroyServers() {
void qServer::ServerThread(ServerSocket* sock) {
FILE_LOG(logDEBUG) << "Starting Gui Server at port " << sock->getPort();
while (threadRunning)) {
while (guiServerRunning)) {
try{
sock->accept();
if (DecodeFunction(sock) == GOODBYE) {
threadRunning = false;
guiServerRunning = false;
}
sock->close();
}