ETM-Schurig
/
nymea
mirror of https://github.com/nymea/nymea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix issues from code review

pull/135/head
Michael Zanetti 2018-09-04 11:32:20 +02:00
parent 699065f689
commit 83168772f3
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnymea-core/cloud/awsconnector.cpp
View File

@ -537,7 +537,7 @@ QString AWSConnector::getCertificateFingerprint(const QString &certificateFile)
{
QFile certFile(certificateFile);
if (!certFile.open(QFile::ReadOnly)) {
qCWarning(dcAWS()) << "Error openi<ng certificate file" << certificateFile;
qCWarning(dcAWS()) << "Error opening certificate file" << certificateFile;
return QString();
}
QSslCertificate crt = QSslCertificate(certFile.readAll());

7
libnymea-core/cloud/cloudmanager.h
View File

@ -54,10 +54,6 @@ public:
explicit CloudManager(NymeaConfiguration *configuration, NetworkManager *networkManager, QObject *parent = nullptr);
~CloudManager();
// void setServerUrl(const QString &serverUrl);
// void setDeviceId(const QUuid &deviceId);
// void setClientCertificates(const QString &caCertificate, const QString &clientCertificate, const QString &clientCertificateKey);
bool enabled() const;
void setEnabled(bool enabled);
@ -96,6 +92,7 @@ private:
JanusConnector *m_janusConnector = nullptr;
NymeaConfiguration *m_configuration = nullptr;
NetworkManager *m_networkManager = nullptr;
CloudTransport *m_transport = nullptr;
QString m_serverUrl;
QUuid m_deviceId;
@ -103,8 +100,6 @@ private:
QString m_caCertificate;
QString m_clientCertificate;
QString m_clientCertificateKey;
CloudTransport *m_transport;
};
}

1
server/main.cpp
View File

@ -133,6 +133,7 @@ int main(int argc, char *argv[])
s_loggingFilters.insert("Avahi", false);
s_loggingFilters.insert("UPnP", false);
s_loggingFilters.insert("Cloud", true);
s_loggingFilters.insert("CloudTraffic", false);
s_loggingFilters.insert("NetworkManager", false);
s_loggingFilters.insert("UserManager", true);
s_loggingFilters.insert("AWS", false);