Only display the verbose error message once.

[quassel.git] / src / core / sslserver.cpp

diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 8006ebd..bfcdbf2 100644 (file)
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -32,10 +32,20 @@
 
 #ifdef HAVE_SSL
 
+static bool SslServer_longMessShown=false;
+
 SslServer::SslServer(QObject *parent)
   : QTcpServer(parent)
 {
-  setCertificate(quasselDir().absolutePath() + "/quasselCert.pem");
+  if (! setCertificate(quasselDir().absolutePath() + "/quasselCert.pem")) {
+    if (! SslServer_longMessShown) {
+      qWarning()
+        << "SslServer: Unable to set certificate file\n"
+        << "          Quassel Core will still work, but cannot provide SSL for client connections.\n"
+        << "          Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
+      SslServer_longMessShown=true;
+    }
+  }
 }
 
 QTcpSocket *SslServer::nextPendingConnection() {
@@ -88,13 +98,20 @@ bool SslServer::setCertificate(const QString &path) {
   _key = QSslKey(&certFile, QSsl::Rsa);
   certFile.close();
 
-  if(_cert.isNull() || !_cert.isValid() || _key.isNull()) {
-    qWarning() << "SslServer: SSL Certificate is either missing or has a wrong format!\n"
-               << "          Quassel Core will still work, but cannot provide SSL for client connections.\n"
-               << "          Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support.";
-  } else {
-    _certIsValid = true;
+  if (_cert.isNull()) {
+    qWarning() << "SslServer:" << qPrintable(path) << "contains no certificate data";
+    return false;
   }
+  if (! _cert.isValid()) {
+    qWarning() << "SslServer: Invalid certificate";
+    return false;
+  }
+  if (_key.isNull()) {
+    qWarning() << "SslServer:" << qPrintable(path) << "contains no key data";
+    return false;
+  }
+
+  _certIsValid = true;
 
   return _certIsValid;
 }