implemented reloading for qdsapp daemon

Skycoder42 · Skycoder42 · commit f19a40ec08d7 · 2018-06-15T15:21:06.000+02:00
diff --git a/src/datasync/datastoremodel.h b/src/datasync/datastoremodel.h
@@ -10,7 +10,7 @@ namespace QtDataSync {
 
 class DataStoreModelPrivate;
 //! A passive item model for a datasync data store
-class Q_DATASYNC_EXPORT DataStoreModel : public QAbstractTableModel //TODO test if breaks binary compat
+class Q_DATASYNC_EXPORT DataStoreModel : public QAbstractTableModel
 {
 	Q_OBJECT
 	friend class DataStoreModelPrivate;
diff --git a/tools/appserver/clientconnector.cpp b/tools/appserver/clientconnector.cpp
@@ -6,17 +6,40 @@
 #include "datasyncservice.h"
 
 ClientConnector::ClientConnector(DatabaseController *database, QObject *parent) :
-	QObject(parent),
-	database(database),
-	server(nullptr),
-	secret(),
-	clients()
+	QObject{parent},
+	database{database}
 {
-	auto name = qService->configuration()->value(QStringLiteral("server/name"), QCoreApplication::applicationName()).toString();
-	auto mode = qService->configuration()->value(QStringLiteral("server/wss"), false).toBool() ? QWebSocketServer::SecureMode : QWebSocketServer::NonSecureMode;
+	recreateServer();
+	connect(database, &DatabaseController::notifyChanged,
+			this, &ClientConnector::notifyChanged,
+			Qt::QueuedConnection);
+}
+
+void ClientConnector::recreateServer()
+{
+	//stuff that always needs to be done
+	emit disconnectAll();
 	secret = qService->configuration()->value(QStringLiteral("server/secret")).toString();
 
-	server = new QWebSocketServer(name, mode, this);
+	// stop here if activated
+	if(isActivated) {
+		qWarning() << "An activated service cannot restart the websocket server."
+				   << "Reloading will continue with the running instance (changes to \"server/name\" and \"server/wss\" will be ignored";
+		return;
+	}
+
+	// (re)create the server
+	if(server) {
+		server->close();
+		server->deleteLater();
+		server = nullptr;
+	}
+
+	server = new QWebSocketServer{
+		qService->configuration()->value(QStringLiteral("server/name"), QCoreApplication::applicationName()).toString(),
+		qService->configuration()->value(QStringLiteral("server/wss"), false).toBool() ? QWebSocketServer::SecureMode : QWebSocketServer::NonSecureMode,
+		this
+	};
 	connect(server, &QWebSocketServer::newConnection,
 			this, &ClientConnector::newConnection);
 	connect(server, &QWebSocketServer::serverError,
@@ -27,10 +50,6 @@ ClientConnector::ClientConnector(DatabaseController *database, QObject *parent)
 		connect(server, &QWebSocketServer::originAuthenticationRequired,
 				this, &ClientConnector::verifySecret);
 	}
-
-	connect(database, &DatabaseController::notifyChanged,
-			this, &ClientConnector::notifyChanged,
-			Qt::QueuedConnection);
 }
 
 bool ClientConnector::setupWss()
@@ -61,7 +80,7 @@ bool ClientConnector::setupWss()
 								  &localCert,
 								  &caCerts,
 								  qService->configuration()->value(QStringLiteral("server/wss/pass")).toString().toUtf8())) {
-		auto conf = server->sslConfiguration();
+		auto conf = QSslConfiguration::defaultConfiguration();
 		conf.setLocalCertificate(localCert);
 		conf.setPrivateKey(privateKey);
 		caCerts.append(conf.caCertificates());
@@ -80,6 +99,11 @@ bool ClientConnector::setupWss()
 
 bool ClientConnector::listen()
 {
+	if(isActivated) {
+		qDebug() << "Still listening on port" << server->serverPort();
+		return true;
+	}
+
 	quint16 port = 0;
 	auto dSocket = qService->getSocket();
 	if(dSocket != -1) {
@@ -89,6 +113,8 @@ bool ClientConnector::listen()
 						<< "with error:" << server->errorString();
 			return false;
 		}
+		// mark as activated server
+		isActivated = true;
 	} else {
 		QHostAddress host {
 			qService->configuration()->value(QStringLiteral("server/host"),
diff --git a/tools/appserver/clientconnector.h b/tools/appserver/clientconnector.h
@@ -13,6 +13,7 @@ class ClientConnector : public QObject
 public:
 	explicit ClientConnector(DatabaseController *database, QObject *parent = nullptr);
 
+	void recreateServer();
 	bool setupWss();
 	bool listen();
 	void close();
@@ -37,8 +38,9 @@ private Q_SLOTS:
 
 private:
 	DatabaseController *database;
-	QWebSocketServer *server;
+	QWebSocketServer *server = nullptr;
 	QString secret;
+	bool isActivated = false;
 
 	QHash<QUuid, Client*> clients;
 };
diff --git a/tools/appserver/databasecontroller.cpp b/tools/appserver/databasecontroller.cpp
@@ -48,6 +48,14 @@ void DatabaseController::initialize()
 					  quota, force);
 }
 
+void DatabaseController::reload()
+{
+	auto quota = qService->configuration()->value(QStringLiteral("quota/limit"), 10485760).toULongLong(); //10MB
+	auto force = qService->configuration()->value(QStringLiteral("quota/force"), false).toBool();
+	QtConcurrent::run(qService->threadPool(), this, &DatabaseController::updateQuotaLimit,
+					  quota, force);
+}
+
 void DatabaseController::cleanupDevices()
 {
 	auto offlineSinceDays = qService->configuration()->value(QStringLiteral("cleanup/interval"),
diff --git a/tools/appserver/databasecontroller.h b/tools/appserver/databasecontroller.h
@@ -44,6 +44,7 @@ class DatabaseController : public QObject
 	explicit DatabaseController(QObject *parent = nullptr);
 
 	void initialize();
+	void reload();
 
 	void cleanupDevices();
 
diff --git a/tools/appserver/datasyncservice.cpp b/tools/appserver/datasyncservice.cpp
@@ -64,45 +64,12 @@ QtService::Service::CommandMode DatasyncService::onStart()
 		return Synchronous;
 	}
 
-	//before anything else: read log level
-	//NOTE move to service lib
-	auto logLevel = _config->value(QStringLiteral("loglevel"),
-#ifndef QT_NO_DEBUG
-								   4
-#else
-								   3
-#endif
-								   ).toInt();
-	QString logStr;
-	switch (logLevel) {
-	case 0: //log nothing
-		logStr.prepend(QStringLiteral("\n*.critical=false"));
-		Q_FALLTHROUGH();
-	case 1: //log critical
-		logStr.prepend(QStringLiteral("\n*.warning=false"));
-		Q_FALLTHROUGH();
-	case 2: //log warn
-		logStr.prepend(QStringLiteral("\n*.info=false"));
-		Q_FALLTHROUGH();
-	case 3: //log info
-		logStr.prepend(QStringLiteral("*.debug=false"));
-		QLoggingCategory::setFilterRules(logStr);
-		break;
-	case 4: //log any
-	default:
-		break;
-	}
-
+	//before anything else: set the log level
+	setLogLevel();
 	qDebug() << "Using configuration:" << _config->fileName();
 
 	_mainPool = new QThreadPool(this);
-	_mainPool->setMaxThreadCount(_config->value(QStringLiteral("threads/count"),
-											  QThread::idealThreadCount()).toInt());
-	auto timeoutMin = _config->value(QStringLiteral("threads/expire"), 10).toInt(); //in minutes
-	_mainPool->setExpiryTimeout(static_cast<int>(duration_cast<milliseconds>(minutes(timeoutMin)).count()));
-	qDebug() << "Running with max" << _mainPool->maxThreadCount()
-			 << "threads and an expiry timeout of" << timeoutMin
-			 << "minutes";
+	setupThreadPool();
 
 	_database = new DatabaseController(this);
 	_connector = new ClientConnector(_database, this);
@@ -124,7 +91,7 @@ QtService::Service::CommandMode DatasyncService::onStart()
 QtService::Service::CommandMode DatasyncService::onStop(int &exitCode)
 {
 	qDebug() << "Stopping server...";
-	_connector->disconnectAll();
+	emit _connector->disconnectAll();
 	_mainPool->clear();
 	_mainPool->waitForDone();
 	exitCode = EXIT_SUCCESS;
@@ -134,8 +101,33 @@ QtService::Service::CommandMode DatasyncService::onStop(int &exitCode)
 
 QtService::Service::CommandMode DatasyncService::onReload()
 {
-	//TODO implement
-	Q_UNIMPLEMENTED();
+	// cast is ok here as I own the settings - they are only const to prevent accidental writes
+	const_cast<QSettings*>(_config)->sync();
+	if(_config->status() != QSettings::NoError) {
+		qCritical() << "Failed reload configuration file"
+					<< _config->fileName()
+					<< "with error:"
+					<< (_config->status() == QSettings::AccessError ? "Access denied" : "Invalid format");
+		qCritical() << "Reload failed. Configuration has not been reloaded!";
+		return Synchronous;
+	}
+
+	// before anything else: set the log level
+	setLogLevel();
+	// adjust threadpool parameters
+	setupThreadPool();
+
+	// update the database
+	_database->reload();
+	// recreate and connect the server
+	_connector->recreateServer();
+	if(!_connector->setupWss() ||
+	   !_connector->listen()) {
+		qApp->exit(EXIT_FAILURE);
+		return Synchronous;
+	}
+
+	qDebug() << QCoreApplication::applicationName() << "completed reloading";
 	return Synchronous;
 }
 
@@ -219,6 +211,49 @@ void DatasyncService::command(int cmd)
 	}
 }
 
+void DatasyncService::setLogLevel()
+{
+	auto logLevel = _config->value(QStringLiteral("loglevel"),
+#ifndef QT_NO_DEBUG
+								   4
+#else
+								   3
+#endif
+								   ).toInt();
+	QString logStr;
+	switch (logLevel) {
+	case 0: //log nothing
+		logStr.prepend(QStringLiteral("\n*.critical=false"));
+		Q_FALLTHROUGH();
+	case 1: //log critical
+		logStr.prepend(QStringLiteral("\n*.warning=false"));
+		Q_FALLTHROUGH();
+	case 2: //log warn
+		logStr.prepend(QStringLiteral("\n*.info=false"));
+		Q_FALLTHROUGH();
+	case 3: //log info
+		logStr.prepend(QStringLiteral("*.debug=false"));
+		QLoggingCategory::setFilterRules(logStr);
+		break;
+	case 4: //log any
+		QLoggingCategory::setFilterRules({});
+		break;
+	default:
+		break;
+	}
+}
+
+void DatasyncService::setupThreadPool()
+{
+	_mainPool->setMaxThreadCount(_config->value(QStringLiteral("threads/count"),
+											  QThread::idealThreadCount()).toInt());
+	auto timeoutMin = _config->value(QStringLiteral("threads/expire"), 10).toInt(); //in minutes
+	_mainPool->setExpiryTimeout(static_cast<int>(duration_cast<milliseconds>(minutes(timeoutMin)).count()));
+	qDebug() << "Running with max" << _mainPool->maxThreadCount()
+			 << "threads and an expiry timeout of" << timeoutMin
+			 << "minutes";
+}
+
 int main(int argc, char *argv[])
 {
 	// check if version
diff --git a/tools/appserver/datasyncservice.h b/tools/appserver/datasyncservice.h
@@ -46,6 +46,8 @@ private Q_SLOTS:
 
 	void sigusr1();
 	void command(int cmd);
+	void setLogLevel();
+	void setupThreadPool();
 };
 
 #undef qService
diff --git a/tools/appserver/qdsapp-install.bat b/tools/appserver/qdsapp-install.bat
@@ -1,3 +1,3 @@
 @echo off
-sc create qdsapp binPath= "\"%{QT_INSTALL_BINS}\qdsappsvc.exe\" --backend windows" start= demand displayname= "QDSApp Service" || exit /B 1
+sc create qdsapp binPath= "\"%{QT_INSTALL_BINS}\qdsappsvc.exe\" --backend windows" start= auto displayname= "QDSApp Service" || exit /B 1
 sc description qdsapp "QtDataSync AppServer Service" || exit /B 1
diff --git a/tools/appserver/qdsapp.service b/tools/appserver/qdsapp.service
@@ -7,7 +7,7 @@ After=network-online.target qdsapp.socket
 Type=notify
 NotifyAccess=exec
 ExecStart=%{QT_INSTALL_BINS}/qdsappd -platform minimal --backend systemd
-#ExecReload=%{QT_INSTALL_BINS}/qdsappd -platform minimal --backend systemd reload $MAINPID
+ExecReload=%{QT_INSTALL_BINS}/qdsappd -platform minimal --backend systemd reload $MAINPID
 ExecStop=%{QT_INSTALL_BINS}/qdsappd -platform minimal --backend systemd stop $MAINPID
 WatchdogSec=10
 Restart=on-abnormal

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace QtDataSync {`
`10`	`10`
`11`	`11`	`class DataStoreModelPrivate;`
`12`	`12`	`//! A passive item model for a datasync data store`
`13`		`-class Q_DATASYNC_EXPORT DataStoreModel : public QAbstractTableModel //TODO test if breaks binary compat`
	`13`	`+class Q_DATASYNC_EXPORT DataStoreModel : public QAbstractTableModel`
`14`	`14`	`{`
`15`	`15`	`Q_OBJECT`
`16`	`16`	`friend class DataStoreModelPrivate;`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,14 @@ void DatabaseController::initialize()`
`48`	`48`	`quota, force);`
`49`	`49`	`}`
`50`	`50`
	`51`	`+void DatabaseController::reload()`
	`52`	`+{`
	`53`	`+ auto quota = qService->configuration()->value(QStringLiteral("quota/limit"), 10485760).toULongLong(); //10MB`
	`54`	`+ auto force = qService->configuration()->value(QStringLiteral("quota/force"), false).toBool();`
	`55`	`+ QtConcurrent::run(qService->threadPool(), this, &DatabaseController::updateQuotaLimit,`
	`56`	`+ quota, force);`
	`57`	`+}`
	`58`	`+`
`51`	`59`	`void DatabaseController::cleanupDevices()`
`52`	`60`	`{`
`53`	`61`	`auto offlineSinceDays = qService->configuration()->value(QStringLiteral("cleanup/interval"),`