diff --git a/libguh-core/cloudmanager.cpp b/libguh-core/cloudmanager.cpp index 631853d9..22106c73 100644 --- a/libguh-core/cloudmanager.cpp +++ b/libguh-core/cloudmanager.cpp @@ -119,7 +119,6 @@ void CloudManager::pairDevice(const QString &idToken, const QString &userId) void CloudManager::connect2aws() { m_awsConnector->connect2AWS(m_serverUrl, -// "1e10fb7e-d9d9-4145-88dd-2d3caf623c18", // micha's test id (needs micha's test certs) - remove that before merging m_deviceId.toString().remove(QRegExp("[{}]*")), m_deviceName, m_caCertificate, diff --git a/libguh-core/janusconnector.cpp b/libguh-core/janusconnector.cpp index 2fa94c31..f952a02f 100644 --- a/libguh-core/janusconnector.cpp +++ b/libguh-core/janusconnector.cpp @@ -34,12 +34,6 @@ JanusConnector::JanusConnector(QObject *parent) : QObject(parent) connect(m_socket, static_cast(&QLocalSocket::error), this, &JanusConnector::onError); connect(m_socket, &QLocalSocket::disconnected, this, &JanusConnector::onDisconnected); connect(m_socket, &QLocalSocket::readyRead, this, &JanusConnector::onReadyRead); - connect(m_socket, &QLocalSocket::stateChanged, [&](QLocalSocket::LocalSocketState state) { - qCWarning(dcJanus()) << "state changed" << state; - }); - connect(m_socket, &QLocalSocket::readChannelFinished, [&]() { - qCWarning(dcJanus()) << "readchannel finished"; - }); connect(&m_socketTimeoutTimer, &QTimer::timeout, this, &JanusConnector::heartbeat); m_socketTimeoutTimer.setInterval(5000); @@ -146,7 +140,7 @@ void JanusConnector::sendWebRtcHandshakeMessage(const QString &sessionId, const void JanusConnector::processQueue() { if (!m_socket->isOpen()) { - qCWarning(dcJanus()) << "janus socket not open. Cannot process queue"; + qCWarning(dcJanus()) << "Janus socket not open. Cannot process queue"; return; } @@ -193,17 +187,17 @@ void JanusConnector::processQueue() void JanusConnector::onDisconnected() { - qCDebug(dcJanus) << "disconnected from Janus"; + qCDebug(dcJanus) << "Disconnected from Janus"; } void JanusConnector::onError(QLocalSocket::LocalSocketError socketError) { - qCDebug(dcJanus) << "error in janus connection" << socketError << m_socket->errorString(); + qCWarning(dcJanus) << "Error in janus connection" << socketError << m_socket->errorString(); } void JanusConnector::onTextMessageReceived(const QString &message) { - qCDebug(dcJanus) << "text message received from Janus" << message; + qCDebug(dcJanus) << "Text message received from Janus" << message; } void JanusConnector::onReadyRead() diff --git a/libguh-core/libguh-core.pro b/libguh-core/libguh-core.pro index dedb7959..ac432317 100644 --- a/libguh-core/libguh-core.pro +++ b/libguh-core/libguh-core.pro @@ -11,7 +11,7 @@ target.path = /usr/lib/$$system('dpkg-architecture -q DEB_HOST_MULTIARCH') INSTALLS += target exists("/usr/include/mbedtls/net_sockets.h") { -DEFINES += MBEDTLS_NEW_HEADERS + DEFINES += MBEDTLS_NEW_HEADERS } # icons for the webserver