Merge lp:~pete-woods/indicator-network/improve-logging into lp:indicator-network

[Pete Woods]

Improve logging

Improve logging

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

[Charles Kerr (charlesk)]

Oh, I'm stealing this.

review: Approve

[Charles Kerr (charlesk)]

Not a showstopper, but a minor nit this does kick up one new warning when I build:

src/util/logging.cpp: In function ‘void util::loggingFunction(QtMsgType, const QMessageLogContext&, const QString&)’:
src/util/logging.cpp:28:16: warning: switch missing default case [-Wswitch-default]

=== modified file 'src/agent/KeyringCredentialStore.cpp'
--- src/agent/KeyringCredentialStore.cpp	2016-02-18 12:37:05 +0000
+++ src/agent/KeyringCredentialStore.cpp	2016-05-26 16:58:27 +0000
@@ -80,7 +80,7 @@
 			}
 			g_error_free(error);
 		}
-		qCritical() << __PRETTY_FUNCTION__ << message;
+		qCritical() << message;
 	}
 }
 
@@ -146,7 +146,7 @@
 				message = QString::fromUtf8(error->message);
 			}
 			g_error_free(error);
-			qCritical() << __PRETTY_FUNCTION__ << message;
+			qCritical() << message;
 		}
 	}
 }
 
=== modified file 'src/agent/SecretAgent.cpp'
--- src/agent/SecretAgent.cpp	2016-02-18 12:37:30 +0000
+++ src/agent/SecretAgent.cpp	2016-05-26 16:58:27 +0000
@@ -132,7 +132,7 @@
 					NM_SECRET_AGENT_CAPABILITY_NONE);
 			reply.waitForFinished();
 			if (reply.isError()) {
-				qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+				qCritical() << reply.error().message();
 			}
 		}
 	}
@@ -176,7 +176,7 @@
 						NM_SECRET_AGENT_CAPABILITY_NONE);
 	reply.waitForFinished();
 	if (reply.isError()) {
-		qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+		qCritical() << reply.error().message();
 	}
 }
 
@@ -184,7 +184,7 @@
 	auto reply = d->m_agentManager.Unregister();
 	reply.waitForFinished();
 	if (reply.isError()) {
-		qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+		qCritical() << reply.error().message();
 	}
 }
 
@@ -232,7 +232,7 @@
 
 	setDelayedReply(true);
 
-	qDebug() << __PRETTY_FUNCTION__ << connectionPath.path() << settingName << hints << flags;
+	qDebug() << connectionPath.path() << settingName << hints << flags;
 
 	// If we want a WiFi secret, and
 	if (settingName == NM_WIRELESS_SECURITY_SETTING_NAME &&
@@ -241,12 +241,12 @@
 				((flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW) > 0) ||
 				((flags & NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED) > 0)
 			)) {
-		qDebug() << __PRETTY_FUNCTION__ << "Requesting secret from user";
+		qDebug() << "Requesting secret from user";
 		d->m_request.reset(new SecretRequest(*this, connection,
 						connectionPath, settingName, hints, flags, message()));
 	} else if (((flags == NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE) ||
 				(flags == NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED))) {
-		qDebug() << __PRETTY_FUNCTION__ << "Retrieving secret from keyring";
+		qDebug() << "Retrieving secret from keyring";
 
 		bool isVpn = (settingName == NM_VPN_SETTING_NAME);
 
@@ -288,7 +288,7 @@
 		d->m_systemConnection.send(
 				message().createReply(QVariant::fromValue(newConnection)));
 	} else {
-		qDebug() << __PRETTY_FUNCTION__ << "Can't get secrets for this connection";
+		qDebug() << "Can't get secrets for this connection";
 		d->m_systemConnection.send(
 				message().createErrorReply("org.freedesktop.NetworkManager.SecretAgent.NoSecrets",
 						"No secrets found for this connection."));
@@ -301,7 +301,7 @@
 	if (error) {
 		d->m_systemConnection.send(
 				request.message().createErrorReply("org.freedesktop.NetworkManager.SecretAgent.NoSecrets",
-						"No password found for this connection."));
+						"No secrets found for this connection."));
 	} else {
 		d->m_systemConnection.send(
 				request.message().createReply(
 
=== modified file 'src/agent/agent-main.cpp'
--- src/agent/agent-main.cpp	2016-02-15 09:31:38 +0000
+++ src/agent/agent-main.cpp	2016-05-26 16:58:27 +0000
@@ -20,6 +20,7 @@
 #include <notify-cpp/notification-manager.h>
 #include <agent/KeyringCredentialStore.h>
 #include <agent/SecretAgent.h>
+#include <util/logging.h>
 #include <util/unix-signal-handler.h>
 #include <dbus-types.h>
 
@@ -38,6 +39,8 @@
 int
 main(int argc, char **argv)
 {
+    qInstallMessageHandler(util::loggingFunction);
+
     QCoreApplication app(argc, argv);
     DBusTypes::registerMetaTypes();
     Variant::registerMetaTypes();
 
=== modified file 'src/indicator/main.cpp'
--- src/indicator/main.cpp	2015-12-11 14:58:11 +0000
+++ src/indicator/main.cpp	2016-05-26 16:58:27 +0000
@@ -18,6 +18,7 @@
  */
 
 #include <factory.h>
+#include <util/logging.h>
 #include <util/unix-signal-handler.h>
 #include <dbus-types.h>
 
@@ -34,9 +35,12 @@
 using namespace std;
 using namespace connectivity_service;
 
+
 int
 main(int argc, char **argv)
 {
+    qInstallMessageHandler(util::loggingFunction);
+
     QCoreApplication app(argc, argv);
     DBusTypes::registerMetaTypes();
     Variant::registerMetaTypes();
 
=== modified file 'src/indicator/nmofono/connection/active-connection-manager.cpp'
--- src/indicator/nmofono/connection/active-connection-manager.cpp	2015-10-06 10:19:30 +0000
+++ src/indicator/nmofono/connection/active-connection-manager.cpp	2016-05-26 16:58:27 +0000
@@ -115,7 +115,7 @@
     reply.waitForFinished();
     if (reply.isError())
     {
-        qWarning() << __PRETTY_FUNCTION__ << reply.error().message();
+        qWarning() << reply.error().message();
         return false;
     }
     return true;
 
=== modified file 'src/indicator/nmofono/hotspot-manager.cpp'
--- src/indicator/nmofono/hotspot-manager.cpp	2016-05-11 16:52:45 +0000
+++ src/indicator/nmofono/hotspot-manager.cpp	2016-05-26 16:58:27 +0000
@@ -62,7 +62,7 @@
 
     void addConnection()
     {
-        qDebug() << __PRETTY_FUNCTION__ << "Adding new hotspot connection";
+        qDebug() << "Adding new hotspot connection";
         QVariantDictMap connection = createConnectionSettings(m_ssid, m_password,
                                                               m_mode, m_auth);
 
@@ -91,7 +91,7 @@
 
     void updateConnection()
     {
-        qDebug() << __PRETTY_FUNCTION__ << "Updating hotspot connection";
+        qDebug() << "Updating hotspot connection";
         // Get new settings
         QVariantDictMap new_settings = createConnectionSettings(m_ssid,
                                                                 m_password,
@@ -129,7 +129,7 @@
         // Wait for connection to activate
         while (count < 20 && activeConnection.state() != NM_ACTIVE_CONNECTION_STATE_ACTIVATED)
         {
-            qDebug() << __PRETTY_FUNCTION__ << "Waiting for hotspot to connect";
+            qDebug() << "Waiting for hotspot to connect";
             QThread::msleep(100);
             ++count;
         }
@@ -144,11 +144,11 @@
     {
         if (!m_hotspot)
         {
-            qWarning() << __PRETTY_FUNCTION__ <<  "Could not find a hotspot setup to enable";
+            qWarning() << "Could not find a hotspot setup to enable";
             return;
         }
 
-        qDebug() << __PRETTY_FUNCTION__ << "Activating hotspot on device" << device.path();
+        qDebug() << "Activating hotspot on device" << device.path();
         bool success = activateConnection(device);
         setEnable(success);
         if (success)
@@ -332,7 +332,7 @@
                 continue;
             }
 
-            qDebug() << __PRETTY_FUNCTION__ << "Using AP interface " << interface;
+            qDebug() << "Using AP interface " << interface;
             m_device = make_unique<ApDevice>(*path, interface);
             break;
         }
@@ -350,7 +350,7 @@
         {
             QThread::msleep(100);
             findApDevice();
-            qDebug() << __PRETTY_FUNCTION__ << "Searching for AP device";
+            qDebug() << "Searching for AP device";
             ++count;
         }
     }
@@ -546,7 +546,7 @@
     {
         if (!m_hotspot)
         {
-            qWarning() << __PRETTY_FUNCTION__ <<  "Could not find a hotspot setup to enable";
+            qWarning() << "Could not find a hotspot setup to enable";
             return;
         }
 
@@ -561,12 +561,12 @@
 
         if (m_device)
         {
-            qDebug() << __PRETTY_FUNCTION__ << "Reactivating hotspot connection on device" << m_device->m_path.path();
+            qDebug() << "Reactivating hotspot connection on device" << m_device->m_path.path();
             activateConnection(m_device->m_path);
         }
         else
         {
-            qWarning() << __PRETTY_FUNCTION__ << "Could not get device when reactivating hotspot connection";
+            qWarning() << "Could not get device when reactivating hotspot connection";
         }
     }
 
@@ -649,7 +649,7 @@
         // If the SSID is empty, we report an error.
         if (d->m_ssid.isEmpty())
         {
-            qWarning() << __PRETTY_FUNCTION__ << "  SSID was empty";
+            qWarning() << "  SSID was empty";
             Q_EMIT reportError(1);
             d->setEnable(false);
             return;
@@ -662,7 +662,7 @@
 
         if (!d->m_device)
         {
-            qWarning() << __PRETTY_FUNCTION__ << "Failed to create AP device";
+            qWarning() << "Failed to create AP device";
             Q_EMIT reportError(1);
             d->setDisconnectWifi(false);
             return;
 
=== modified file 'src/indicator/nmofono/kill-switch.cpp'
--- src/indicator/nmofono/kill-switch.cpp	2015-08-06 11:23:00 +0000
+++ src/indicator/nmofono/kill-switch.cpp	2016-05-26 16:58:27 +0000
@@ -118,7 +118,7 @@
 {
     if (!block && state() == State::hard_blocked)
     {
-        qCritical() << __PRETTY_FUNCTION__ << "Killswitch is hard blocked.";
+        qCritical() << "Killswitch is hard blocked.";
         return;
     }
 
@@ -141,7 +141,7 @@
     }
     catch (std::exception &e)
     {
-        qCritical() << __PRETTY_FUNCTION__ << e.what();
+        qCritical() << e.what();
     }
 }
 
@@ -163,7 +163,7 @@
     }
     catch (std::runtime_error& e)
     {
-        qWarning() << __PRETTY_FUNCTION__ << ": " << QString::fromStdString(e.what());
+        qWarning() << e.what();
         return false;
     }
 }
 
=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2016-05-26 16:58:27 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2016-05-26 16:58:27 +0000
@@ -288,6 +288,9 @@
         auto toAdd = modemPaths;
         toAdd.subtract(currentModemPaths);
 
+        if (!toRemove.isEmpty()) {
+            qDebug() << "Removing modems" << toRemove;
+        }
         for (const auto& path : toRemove)
         {
             auto modem = m_ofonoLinks.take(path);
@@ -301,6 +304,9 @@
             Q_EMIT p.modemsChanged();
         }
 
+        if (!toAdd.isEmpty()) {
+            qDebug() << "Adding modems" << toAdd;
+        }
         for (const auto& path : toAdd)
         {
             auto modemInterface = make_shared<QOfonoModem>();
@@ -467,6 +473,8 @@
 void
 ManagerImpl::setWifiEnabled(bool enabled)
 {
+    qDebug() << "Setting WiFi enabled =" << enabled;
+
     if (!d->m_hasWifi)
     {
         return;
@@ -504,6 +512,8 @@
 void
 ManagerImpl::setHotspotEnabled(bool enabled)
 {
+    qDebug() << "Setting hotspot enabled =" << enabled;
+
     if (d->m_hotspotManager->enabled() == enabled)
     {
         return;
@@ -511,7 +521,7 @@
 
     if (enabled && d->m_flightMode)
     {
-        qWarning() << __PRETTY_FUNCTION__ << "Cannot set hotspot enabled when flight mode is on";
+        qWarning() << "Cannot set hotspot enabled when flight mode is on";
         return;
     }
 
@@ -530,6 +540,8 @@
 void
 ManagerImpl::setFlightMode(bool enabled)
 {
+    qDebug() << "Setting flight mode enabled =" << enabled;
+
     if (enabled == d->m_killSwitch->isFlightMode())
     {
         return;
@@ -567,9 +579,7 @@
 void
 ManagerImpl::device_removed(const QDBusObjectPath &path)
 {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << "Device Removed:" << path.path();
-#endif
+    qDebug() << "Device Removed:" << path.path();
     Link::Ptr toRemove;
     for (auto dev : d->m_nmLinks)
     {
@@ -591,9 +601,7 @@
 void
 ManagerImpl::device_added(const QDBusObjectPath &path)
 {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
     qDebug() << "Device Added:" << path.path();
-#endif
     for (const auto &dev : d->m_nmLinks)
     {
         auto wifiLink = dynamic_pointer_cast<wifi::WifiLinkImpl>(dev);
@@ -623,7 +631,7 @@
             }
         }
     } catch (const exception &e) {
-        qDebug() << __PRETTY_FUNCTION__ << ": failed to create Device proxy for "<< path.path() << ": ";
+        qDebug() << ": failed to create Device proxy for "<< path.path() << ": ";
         qDebug() << "\t" << e.what();
         qDebug() << "\tIgnoring.";
         return;
@@ -694,6 +702,7 @@
                 || d->m_unlockDialog->modem() == modem
                 || count(d->m_pendingUnlocks.begin(), d->m_pendingUnlocks.end(), modem) != 0)
         {
+            qDebug() << "Didn't unlock modem because it's already being unlocked or is queued for unlock" << modem->simIdentifier();
             return;
         }
 
@@ -702,15 +711,18 @@
         {
             if (modem->isReadyToUnlock())
             {
+                qDebug() << "Unlocking modem" << modem->simIdentifier();
                 d->m_unlockDialog->unlock(modem);
             }
             else
             {
+                qDebug() << "Waiting for modem to be ready" << modem->simIdentifier();
                 modem->notifyWhenReadyToUnlock();
             }
         }
         else
         {
+            qDebug() << "Queueing modem for unlock" << modem->simIdentifier();
             d->m_pendingUnlocks.push_back(modem);
         }
     } catch(const exception &e) {
@@ -718,21 +730,16 @@
         // crashed taking the notification server with it. There is no graceful
         // and reliable way to recover so die and get restarted.
         // See also https://bugs.launchpad.net/unity-notifications/+bug/1238990
-        qWarning() << __PRETTY_FUNCTION__ << " sim unlocking failed: " << QString::fromStdString(e.what());
+        qWarning() << " sim unlocking failed: " << QString::fromStdString(e.what());
     }
 }
 
 void
 ManagerImpl::unlockAllModems()
 {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-    qDebug() << __PRETTY_FUNCTION__;
-#endif
+    qDebug() << "Unlock all modems";
     for (auto& m : d->m_ofonoLinks)
     {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-        qDebug() << "Unlocking " << m->simIdentifier();
-#endif
         unlockModem(m);
     }
 }
@@ -740,9 +747,7 @@
 void
 ManagerImpl::unlockModemByName(const QString &name)
 {
-#ifdef INDICATOR_NETWORK_TRACE_MESSAGES
-    qDebug() << __PRETTY_FUNCTION__ ;
-#endif
+    qDebug() << "Unlock modem:" << name;
     auto it = d->m_ofonoLinks.find(name);
     if (it != d->m_ofonoLinks.cend())
     {
 
=== modified file 'src/indicator/nmofono/vpn/vpn-connection.cpp'
--- src/indicator/nmofono/vpn/vpn-connection.cpp	2016-03-04 11:03:02 +0000
+++ src/indicator/nmofono/vpn/vpn-connection.cpp	2016-05-26 16:58:27 +0000
@@ -206,7 +206,7 @@
         reply.waitForFinished();
         if (reply.isError())
         {
-            qWarning() << __PRETTY_FUNCTION__ << reply.error().message() << m_pendingSettings;
+            qWarning() << reply.error().message() << m_pendingSettings;
         }
 
         m_dirty = false;
@@ -237,7 +237,7 @@
         reply.waitForFinished();
         if (reply.isError())
         {
-            qWarning() << __PRETTY_FUNCTION__ << reply.error().message();
+            qWarning() << reply.error().message();
             return;
         }
 
@@ -261,7 +261,7 @@
         reply.waitForFinished();
         if (reply.isError())
         {
-            qWarning() << __PRETTY_FUNCTION__ << reply.error().message();
+            qWarning() << reply.error().message();
             return;
         }
 
 
=== modified file 'src/indicator/nmofono/vpn/vpn-manager.cpp'
--- src/indicator/nmofono/vpn/vpn-manager.cpp	2016-02-23 09:05:16 +0000
+++ src/indicator/nmofono/vpn/vpn-manager.cpp	2016-05-26 16:58:27 +0000
@@ -122,7 +122,7 @@
         QDBusPendingReply<QDBusObjectPath> reply = *call;
         if (reply.isError())
         {
-            qWarning() << __PRETTY_FUNCTION__ << reply.error().message();
+            qWarning() << reply.error().message();
         }
         call->deleteLater();
     }
 
=== modified file 'src/indicator/nmofono/wifi/wifi-link-impl.cpp'
--- src/indicator/nmofono/wifi/wifi-link-impl.cpp	2015-10-06 10:19:30 +0000
+++ src/indicator/nmofono/wifi/wifi-link-impl.cpp	2016-05-26 16:58:27 +0000
@@ -242,7 +242,7 @@
                         NM_DBUS_SERVICE, path.path(), m_dev->connection());
                 shap = make_shared<AccessPointImpl>(ap);
             } catch(const exception &e) {
-                qWarning() << __PRETTY_FUNCTION__ << ": failed to create AccessPoint proxy for "<< path.path() << ": ";
+                qWarning() << "Failed to create AccessPoint proxy for "<< path.path() << ": ";
                 qWarning() << "\t" << QString::fromStdString(e.what());
                 qWarning() << "\tIgnoring.";
                 return;
@@ -261,7 +261,7 @@
             /// @bug dbus-cpp internal logic exploded
             // If this happens, indicator-network is in an unknown state with no clear way of
             // recovering. The only reasonable way out is a graceful exit.
-            cerr << __PRETTY_FUNCTION__ << " Failed to run dbus service: " << e.what() << endl;
+            cerr << " Failed to run dbus service: " << e.what() << endl;
         }
     }
 
@@ -278,7 +278,7 @@
             }
         }
         if (!shap) {
-            qWarning() << __PRETTY_FUNCTION__ << ": Tried to remove access point " << path.path() << " that has not been added.";
+            qWarning() << "Tried to remove access point " << path.path() << " that has not been added.";
             return;
         }
         m_rawAccessPoints = list;
@@ -449,6 +449,8 @@
 void
 WifiLinkImpl::connect_to(AccessPoint::Ptr accessPoint)
 {
+    qDebug() << "Connecting to:" << accessPoint->ssid();
+
     try {
         d->m_connecting = true;
         QByteArray ssid = accessPoint->raw_ssid();
@@ -479,11 +481,13 @@
 
         QDBusObjectPath ac("/");
         if (found) {
+            qDebug() << "Connecting to known access point";
             ac = d->m_nm->ActivateConnection(QDBusObjectPath(found->path()),
                                            QDBusObjectPath(d->m_dev->path()),
                                            accessPoint->object_path());
         } else {
             if (accessPoint->enterprise()) {
+                qDebug() << "New connection to enterprise access point";
                 // activate system settings URI
                 QUrlQuery q;
                 q.addQueryItem("ssid", accessPoint->raw_ssid());
@@ -496,6 +500,7 @@
                     }
                 });
             } else {
+                qDebug() << "New connection to regular access point";
                 QVariantDictMap conf;
 
                 /// @todo getting the ssid multiple times over dbus is stupid.
@@ -519,7 +524,7 @@
         // @bug default timeout expired: LP(#1361642)
         // If this happens, indicator-network is in an unknown state with no clear way of
         // recovering. The only reasonable way out is a graceful exit.
-        qWarning() << __PRETTY_FUNCTION__ << " Failed to activate connection: " << e.what();
+        qWarning() << " Failed to activate connection: " << e.what();
     }
 }
 
 
=== modified file 'src/indicator/nmofono/wwan/modem.cpp'
--- src/indicator/nmofono/wwan/modem.cpp	2016-05-26 16:58:27 +0000
+++ src/indicator/nmofono/wwan/modem.cpp	2016-05-26 16:58:27 +0000
@@ -20,6 +20,7 @@
 #include <nmofono/wwan/modem.h>
 
 #include <ofono/dbus.h>
+#include <QDebug>
 
 #define slots
 #include <qofono-qt5/qofonomodem.h>
@@ -52,7 +53,7 @@
     if (str == "roaming")
         return Modem::ModemStatus::roaming;
 
-    qWarning() << __PRETTY_FUNCTION__ << ": Unknown status" << str;
+    qWarning() << ": Unknown status" << str;
     return Modem::ModemStatus::unknown;
 }
 
@@ -73,7 +74,7 @@
     if (str == "lte")
         return Modem::Bearer::lte;
 
-    qWarning() << __PRETTY_FUNCTION__  << ": Unknown techonology" << str;
+    qWarning() << "Unknown technology" << str;
     return Modem::Bearer::notAvailable;
 }
 }
@@ -160,6 +161,8 @@
 
         if (p.isReadyToUnlock() && m_shouldTriggerUnlock)
         {
+
+            qDebug() << "SIM ready to unlock:" << p.simIdentifier();
             m_shouldTriggerUnlock = false;
             Q_EMIT p.readyToUnlock(p.name());
         }
@@ -760,6 +763,7 @@
 void
 Modem::notifyWhenReadyToUnlock()
 {
+    qDebug() << "Notify when ready to unlock" << simIdentifier();
     d->m_shouldTriggerUnlock = true;
 }
 
 
=== modified file 'src/indicator/root-state.cpp'
--- src/indicator/root-state.cpp	2015-08-14 16:11:08 +0000
+++ src/indicator/root-state.cpp	2016-05-26 16:58:27 +0000
@@ -288,7 +288,7 @@
         try {
             state["icon"] = createIcon(m_networkingIcons.first().toStdString());
         } catch (exception &e) {
-            qWarning() << __PRETTY_FUNCTION__ << e.what();
+            qWarning() << e.what();
         }
 
         for (const auto& icon: m_networkingIcons)
 
=== modified file 'src/indicator/vpn-status-notifier.cpp'
--- src/indicator/vpn-status-notifier.cpp	2015-12-17 10:41:14 +0000
+++ src/indicator/vpn-status-notifier.cpp	2016-05-26 16:58:27 +0000
@@ -64,7 +64,7 @@
             QString id = activeVpnConnection->activeConnection().id();
             QString message = REASON_MAP.value(reason, FAILED_MESSAGE).arg(id);
 
-            qDebug() << __PRETTY_FUNCTION__ << "VPN Connection Failed" << message;
+            qDebug() << "VPN Connection Failed" << message;
             m_notificationManager->notify(_("VPN Connection Failed"), message, "network-vpn", {}, {}, 5)->show();
         }
     }
 
=== modified file 'src/menumodel-cpp/action-group-merger.cpp'
--- src/menumodel-cpp/action-group-merger.cpp	2015-10-06 10:14:57 +0000
+++ src/menumodel-cpp/action-group-merger.cpp	2016-05-26 16:58:27 +0000
@@ -30,7 +30,7 @@
         // then they will override each other in GActionGroup so let's catch that
         // early on.
         if (name_iter->second != action) {
-            qWarning() << __PRETTY_FUNCTION__ << ": Conflicting action names. \"" << action->name() << "\"";
+            qWarning() << "Conflicting action names. \"" << action->name() << "\"";
             /// @todo thow something.
             return;
         }
@@ -73,7 +73,7 @@
     auto iter = m_groups.find(group);
     if (iter != m_groups.end()) {
         /// @todo throw something.
-        std::cerr << __PRETTY_FUNCTION__ << ": Trying to add action group which was already added before." << std::endl;
+        qWarning() << "Trying to add action group which was already added before.";
         return;
     }
 
@@ -91,7 +91,7 @@
     auto iter = m_groups.find(group);
     if (iter == m_groups.end()) {
         /// @todo throw something.
-        std::cerr << __PRETTY_FUNCTION__ << ": Trying to remove action group which was not added before." << std::endl;
+        qWarning() << "Trying to remove action group which was not added before.";
         return;
     }
     auto connections = m_groups[group];
 
=== modified file 'src/menumodel-cpp/menu-item.cpp'
--- src/menumodel-cpp/menu-item.cpp	2015-10-06 10:14:57 +0000
+++ src/menumodel-cpp/menu-item.cpp	2016-05-26 16:58:27 +0000
@@ -83,7 +83,7 @@
     auto gicon = shared_ptr<GIcon>(g_icon_new_for_string(m_icon.toUtf8().constData(), &error), GObjectDeleter());
     if (error)
     {
-        qWarning() << __PRETTY_FUNCTION__ << error->message;
+        qWarning() << error->message;
         g_error_free(error);
         return;
     }
 
=== modified file 'src/notify-cpp/notification.cpp'
--- src/notify-cpp/notification.cpp	2015-12-11 14:58:11 +0000
+++ src/notify-cpp/notification.cpp	2016-05-26 16:58:27 +0000
@@ -95,12 +95,12 @@
 {
     if (d->m_id > 0 && d->m_open && d->m_expireTimeout <= 0)
     {
-        qDebug() << __PRETTY_FUNCTION__ << "Closing notification:" << d->m_id;
+        qDebug() << "Closing notification:" << d->m_id;
         auto reply = d->m_notificationsInterface->CloseNotification(d->m_id);
         reply.waitForFinished();
         if (reply.isError())
         {
-            qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+            qCritical() << reply.error().message();
         }
     }
 }
@@ -221,7 +221,7 @@
         reply.waitForFinished();
         if (reply.isError())
         {
-            qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+            qCritical() << reply.error().message();
         }
         else
         {
@@ -241,7 +241,7 @@
         reply.waitForFinished();
         if (reply.isError())
         {
-            qCritical() << __PRETTY_FUNCTION__ << reply.error().message();
+            qCritical() << reply.error().message();
         }
         else
         {
 
=== modified file 'src/qpowerd/qpowerd.cpp'
--- src/qpowerd/qpowerd.cpp	2015-07-28 08:26:51 +0000
+++ src/qpowerd/qpowerd.cpp	2016-05-26 16:58:27 +0000
@@ -68,7 +68,7 @@
     reply.waitForFinished();
     if (reply.isError())
     {
-        qWarning() << __PRETTY_FUNCTION__ << reply.error().message();
+        qWarning() << reply.error().message();
     }
     else
     {
 
=== modified file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt	2016-02-15 09:31:38 +0000
+++ src/util/CMakeLists.txt	2016-05-26 16:58:27 +0000
@@ -2,6 +2,7 @@
 
 set(UTIL_SOURCES
     dbus-utils.cpp
+    logging.cpp
     unix-signal-handler.cpp
 )
 
 
=== added file 'src/util/logging.cpp'
--- src/util/logging.cpp	1970-01-01 00:00:00 +0000
+++ src/util/logging.cpp	2016-05-26 16:58:27 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#include <logging.h>
+
+namespace util
+{
+    void
+    loggingFunction (QtMsgType type, const QMessageLogContext &context,
+                     const QString &msg)
+    {
+        QByteArray localMsg = msg.toLocal8Bit ();
+        switch (type)
+        {
+            case QtMsgType::QtDebugMsg:
+                fprintf (stderr, "Debug: %s (%s:%u, %s)\n",
+                         localMsg.constData (), context.file, context.line,
+                         context.function);
+                break;
+#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
+            case QtMsgType::QtInfoMsg:
+                fprintf (stderr, "Info: %s (%s:%u, %s)\n",
+                         localMsg.constData (), context.file, context.line,
+                         context.function);
+                break;
+#endif
+            case QtMsgType::QtWarningMsg:
+                fprintf (stderr, "Warning: %s (%s:%u, %s)\n",
+                         localMsg.constData (), context.file, context.line,
+                         context.function);
+                break;
+            case QtMsgType::QtCriticalMsg:
+                fprintf (stderr, "Critical: %s (%s:%u, %s)\n",
+                         localMsg.constData (), context.file, context.line,
+                         context.function);
+                break;
+            case QtMsgType::QtFatalMsg:
+                fprintf (stderr, "Fatal: %s (%s:%u, %s)\n",
+                         localMsg.constData (), context.file, context.line,
+                         context.function);
+                abort ();
+        }
+    }
+}
 
=== added file 'src/util/logging.h'
--- src/util/logging.h	1970-01-01 00:00:00 +0000
+++ src/util/logging.h	2016-05-26 16:58:27 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Pete Woods <[e-mail]>
+ */
+
+#pragma once
+
+#include <QMessageLogContext>
+#include <QString>
+
+namespace util
+{
+    void
+    loggingFunction (QtMsgType type, const QMessageLogContext &context,
+                     const QString &msg);
+}
 
=== modified file 'tests/unit/secret-agent/secret-agent-main.cpp'
--- tests/unit/secret-agent/secret-agent-main.cpp	2016-02-15 09:31:38 +0000
+++ tests/unit/secret-agent/secret-agent-main.cpp	2016-05-26 16:58:27 +0000
@@ -32,6 +32,34 @@
 
 using namespace std;
 
+class DummyCredentialStore : public agent::CredentialStore
+{
+public:
+    DummyCredentialStore() {
+    }
+
+    ~DummyCredentialStore() {
+    }
+
+    void
+    save (const QString&, const QString&, const QString&, const QString&,
+          const QString&)
+    {
+    }
+
+    QMap<QString, QString>
+    get (const QString&, const QString&)
+    {
+        return QMap<QString, QString> ();
+    }
+
+    void
+    clear (const QString&)
+    {
+    }
+
+};
+
 int main(int argc, char *argv[]) {
     QCoreApplication application(argc, argv);
     DBusTypes::registerMetaTypes();
@@ -49,7 +77,7 @@
 
     auto secretAgent = make_unique<agent::SecretAgent>(
                 make_shared<notify::NotificationManager>(GETTEXT_PACKAGE),
-				make_shared<agent::KeyringCredentialStore>(),
+                make_shared<DummyCredentialStore>(),
                 QDBusConnection::systemBus(), QDBusConnection::sessionBus());
 
     if (argc == 2 && QString("--print-address") == argv[1]) {
 
=== modified file 'tests/unit/secret-agent/test-secret-agent.cpp'
--- tests/unit/secret-agent/test-secret-agent.cpp	2016-02-15 09:31:38 +0000
+++ tests/unit/secret-agent/test-secret-agent.cpp	2016-05-26 16:58:27 +0000
@@ -261,9 +261,9 @@
 	reply.waitForFinished();
 
 	ASSERT_TRUE(reply.isError());
-	EXPECT_EQ(QDBusError::InternalError, reply.error().type());
-	EXPECT_EQ("No password found for this connection.",
-			reply.error().message());
+	EXPECT_EQ("org.freedesktop.NetworkManager.SecretAgent.NoSecrets", reply.error().name().toStdString());
+	EXPECT_EQ("No secrets found for this connection.",
+			reply.error().message().toStdString());
 }
 
 /* Tests that if we request secrets and then cancel the request
 
=== modified file 'tests/utils/CMakeLists.txt'
--- tests/utils/CMakeLists.txt	2014-08-05 21:16:22 +0000
+++ tests/utils/CMakeLists.txt	2016-05-26 16:58:27 +0000
@@ -8,7 +8,8 @@
     action-utils.cpp
 )
 
-qt5_use_modules(
+target_link_libraries(
     test-utils
-    Core
+    Qt5::Core
+    util
 )
 
=== modified file 'tests/utils/main.cpp'
--- tests/utils/main.cpp	2016-03-04 11:11:56 +0000
+++ tests/utils/main.cpp	2016-05-26 16:58:27 +0000
@@ -25,6 +25,8 @@
 
 #include <libqtdbusmock/DBusMock.h>
 
+#include <util/logging.h>
+
 using namespace QtDBusMock;
 
 class Runner: public QObject
@@ -39,6 +41,8 @@
 
 int main(int argc, char **argv)
 {
+    qInstallMessageHandler(util::loggingFunction);
+
     qputenv("LANG", "C.UTF-8");
     unsetenv("LC_ALL");
     unsetenv("GDM_LANG");