BaseJob: small refactoring and cleanup in logging code

2 files changed, 14 insertions, 15 deletions

diff --git a/jobs/basejob.cpp b/jobs/basejob.cpp
index eb250723..5198c45c 100644
--- a/jobs/basejob.cpp
+++ b/jobs/basejob.cpp
@@ -84,18 +84,6 @@ class BaseJob::Private
         LoggingCategory logCat = JOBS;
 };
 
-inline QDebug operator<<(QDebug dbg, const BaseJob* j)
-{
-    return dbg << j->objectName();
-}
-
-QDebug QMatrixClient::operator<<(QDebug dbg, const BaseJob::Status& s)
-{
-    QRegularExpression filter { "(access_token)(=|: )[-_A-Za-z0-9]+" };
-    return dbg << s.code << ':'
-               << QString(s.message).replace(filter, "\\1 HIDDEN");
-}
-
 BaseJob::BaseJob(HttpVerb verb, const QString& name, const QString& endpoint, bool needsToken)
     : BaseJob(verb, name, endpoint, Query { }, Data { }, needsToken)
 { }
@@ -319,7 +307,7 @@ BaseJob::Status BaseJob::checkReply(QNetworkReply* reply) const
             if (checkContentType(reply->rawHeader("Content-Type"),
                                  d->expectedContentTypes))
                 return NoError;
-            else
+            else // A warning in the logs might be more proper instead
                 return { IncorrectResponseError,
                          "Incorrect content type of the response" };
 
@@ -383,7 +371,7 @@ void BaseJob::finishJob()
         const auto retryInterval =
                 error() == TimeoutError ? 0 : getNextRetryInterval();
         ++d->retriesTaken;
-        qCWarning(d->logCat) << this << "will take retry" << d->retriesTaken
+        qCWarning(d->logCat) << this << "will retry" << d->retriesTaken
                    << "in" << retryInterval/1000 << "s";
         d->retryTimer.start(retryInterval);
         emit retryScheduled(d->retriesTaken, retryInterval);
@@ -456,6 +444,7 @@ void BaseJob::setStatus(Status s)
 
 void BaseJob::setStatus(int code, QString message)
 {
+    message.replace(d->connection->accessToken(), "(REDACTED)");
     setStatus({ code, message });
 }
 
diff --git a/jobs/basejob.h b/jobs/basejob.h
index a5b457c5..fa253d96 100644
--- a/jobs/basejob.h
+++ b/jobs/basejob.h
@@ -98,7 +98,12 @@ namespace QMatrixClient
                     Status(int c, QString m) : code(c), message(std::move(m)) { }
 
                     bool good() const { return code < ErrorLevel; }
-                    friend QDebug operator<<(QDebug dbg, const Status& s);
+                    friend QDebug operator<<(QDebug dbg, const Status& s)
+                    {
+                        QDebug(dbg).noquote().nospace()
+                                << s.code << ": " << s.message;
+                        return dbg;
+                    }
 
                     int code;
                     QString message;
@@ -124,6 +129,11 @@ namespace QMatrixClient
             Q_INVOKABLE duration_t getNextRetryInterval() const;
             Q_INVOKABLE duration_t millisToRetry() const;
 
+            friend QDebug operator<<(QDebug dbg, const BaseJob* j)
+            {
+                return dbg << j->objectName();
+            }
+
         public slots:
             void start(const ConnectionData* connData);