Add more debug messages for POP serviceHEADmaster

Also prefix the send and receive messages with the
account number. It helps when several accounts are
reporting at the same time to follow the actions of
each account.

Change-Id: Ie48bea49219cf451a62a2780f2ba122afb67f5d4
Reviewed-by: Pekka Vuorela <[email protected]>

2 files changed, 8 insertions, 2 deletions

diff --git a/src/plugins/credentials/sso/ssomanager.cpp b/src/plugins/credentials/sso/ssomanager.cpp
index 8ea886b7..8f76a1dc 100644
--- a/src/plugins/credentials/sso/ssomanager.cpp
+++ b/src/plugins/credentials/sso/ssomanager.cpp
@@ -135,6 +135,7 @@ bool SSOManager::start(const QString &method, const QString &mechanism,
         sessionData = oauth2Data;
     }
     if (m_session) {
+        qCDebug(lcMessaging) << "SSO: starting credentials retrieval.";
         m_status = Fetching;
         emit statusChanged();
         sessionData.setUiPolicy(SignOn::NoUserInteractionPolicy);
@@ -208,6 +209,7 @@ void SSOManager::onError(const SignOn::Error &code)
         || code.type() == SignOn::Error:: UserInteraction) {
         invalidate();
     }
+    qCDebug(lcMessaging) << "SSO: got error response," << m_errorMessage;
 
     emit statusChanged();
 }
diff --git a/src/plugins/messageservices/pop/popclient.cpp b/src/plugins/messageservices/pop/popclient.cpp
index 34079832..fdc50c4b 100644
--- a/src/plugins/messageservices/pop/popclient.cpp
+++ b/src/plugins/messageservices/pop/popclient.cpp
@@ -402,6 +402,7 @@ void PopClient::transportError(int status, QString msg)
 
 void PopClient::closeConnection()
 {
+    qCDebug(lcPOP) << "closing connection, account" << config.id();
     inactiveTimer.stop();
 
     if (transport) {
@@ -438,7 +439,7 @@ void PopClient::sendCommand(const char *data, int len)
             logData = logData.left(passExp.matchedLength()) + "<password hidden>";
         }
 
-        qCDebug(lcPOP) << "SEND:" << logData;
+        qCDebug(lcPOP) << "[" << config.id() << "]" << "SEND:" << logData;
     }
 }
 
@@ -472,7 +473,7 @@ void PopClient::incomingData()
 void PopClient::processResponse(const QString &response)
 {
     if ((response.length() > 1) && (status != MessageDataRetr) && (status != MessageDataTop)) {
-        qCDebug(lcPOP) << "RECV:" << qPrintable(response.left(response.length() - 2));
+        qCDebug(lcPOP) << "[" << config.id() << "]" << "RECV:" << qPrintable(response.left(response.length() - 2));
     }
 
     bool waitForInput = false;
@@ -744,6 +745,7 @@ void PopClient::nextAction()
     }
     case Connected:
     {
+        qCDebug(lcPOP) << "connected, checking credentials status" << credentials->status();
         if (credentials->status() == QMailCredentialsInterface::Ready) {
             emit updateStatus(tr("Logging in"));
 
@@ -961,6 +963,7 @@ void PopClient::nextAction()
     }
     case Quit:
     {
+        qCDebug(lcPOP) << "[" << config.id() << "]" << "logging out.";
         emit updateStatus(tr("Logging out"));
         nextStatus = Exit;
         nextCommand = "QUIT";
@@ -1294,6 +1297,7 @@ void PopClient::deactivateConnection()
 {
     const int inactivityPeriod = 20 * 1000;
 
+    qCDebug(lcPOP) << "starting inactivity timer for account" << config.id();
     inactiveTimer.start(inactivityPeriod);
     selected = false;
 }