frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure key member initialization - WebServer

Browse Source
This commit is contained in:
LordGrey
2023-12-27 20:41:10 +01:00
parent 757d84c378
commit ca88678745
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/webserver/WebServer.h
View File

@@ -92,11 +92,6 @@ private:
StaticFileServing* _staticFileServing; StaticFileServing* _staticFileServing;
QtHttpServer* _server; QtHttpServer* _server;
bool _inited = false; bool _inited = false;
const QString WEBSERVER_DEFAULT_PATH = ":/webconfig";
const QString WEBSERVER_DEFAULT_CRT_PATH = ":/hyperion.crt";
const QString WEBSERVER_DEFAULT_KEY_PATH = ":/hyperion.key";
quint16 WEBSERVER_DEFAULT_PORT = 8090;
}; };
#endif // WEBSERVER_H #endif // WEBSERVER_H

11
libsrc/webserver/WebServer.cpp
View File

@@ -16,6 +16,13 @@ namespace {
const char HTTPS_SERVICE_TYPE[] = "https"; const char HTTPS_SERVICE_TYPE[] = "https";
const char HYPERION_SERVICENAME[] = "Hyperion"; const char HYPERION_SERVICENAME[] = "Hyperion";
const char WEBSERVER_DEFAULT_PATH[] = ":/webconfig";
const char WEBSERVER_DEFAULT_CRT_PATH[] = ":/hyperion.crt";
const char WEBSERVER_DEFAULT_KEY_PATH[] = ":/hyperion.key";
quint16 WEBSERVER_DEFAULT_PORT = 8090;
quint16 WBSERVERR_DEFAULT_SSL_PORT = 8092;
} //End of constants } //End of constants
WebServer::WebServer(const QJsonDocument& config, bool useSsl, QObject* parent) WebServer::WebServer(const QJsonDocument& config, bool useSsl, QObject* parent)
@@ -23,6 +30,7 @@ WebServer::WebServer(const QJsonDocument& config, bool useSsl, QObject* parent)
, _config(config) , _config(config)
, _useSsl(useSsl) , _useSsl(useSsl)
, _log(Logger::getInstance("WEBSERVER")) , _log(Logger::getInstance("WEBSERVER"))
, _port(WEBSERVER_DEFAULT_PORT)
, _server() , _server()
{ {
} }
@@ -41,7 +49,6 @@ void WebServer::initServer()
if (_useSsl) if (_useSsl)
{ {
_server->setUseSecure(); _server->setUseSecure();
WEBSERVER_DEFAULT_PORT = 8092;
} }
connect(_server, &QtHttpServer::started, this, &WebServer::onServerStarted); connect(_server, &QtHttpServer::started, this, &WebServer::onServerStarted);
@@ -111,7 +118,7 @@ void WebServer::handleSettingsUpdate(settings::type type, const QJsonDocument& c
_staticFileServing->setBaseUrl(_baseUrl); _staticFileServing->setBaseUrl(_baseUrl);
// ssl different port // ssl different port
quint16 newPort = _useSsl ? obj["sslPort"].toInt(WEBSERVER_DEFAULT_PORT) : obj["port"].toInt(WEBSERVER_DEFAULT_PORT); quint16 newPort = _useSsl ? obj["sslPort"].toInt(WBSERVERR_DEFAULT_SSL_PORT) : obj["port"].toInt(WEBSERVER_DEFAULT_PORT);
if (_port != newPort) if (_port != newPort)
{ {
_port = newPort; _port = newPort;