Merge lp:~pete-woods/libusermetrics/robust-qml into lp:libusermetrics

[Pete Woods]

Handle exceptions in the QML API

Handle exceptions in the QML API

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2013-09-25 10:12:27 +0000
+++ po/en_GB.po	2013-09-26 15:27:09 +0000
@@ -2,12 +2,11 @@
 # This file is distributed under the same license as the libusermetrics package.
 # Pete Woods <[e-mail]>, 2013.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: libusermetrics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-25 11:09+0100\n"
+"POT-Creation-Date: 2013-09-26 16:22+0100\n"
 "PO-Revision-Date: 2013-07-05 15:09+0100\n"
 "Last-Translator: Pete Woods <[e-mail]>\n"
 "Language-Team: British English <[e-mail]>\n"
@@ -30,7 +29,6 @@
 msgstr "Attempt to create data source owned by another application"
 
 #: src/usermetricsservice/DBusUserMetrics.cpp:241
-#, fuzzy
 msgid "Attempt to create user data owned by another user"
 msgstr "Attempt to create user data owned by another user"
 
@@ -85,7 +83,6 @@
 msgstr "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME <DATA>"
 
 #: src/libusermetricsinput/main-increment.cpp:37
-#, fuzzy
 msgid "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]"
 msgstr "DATA_SOURCE_ID FORMAT_STRING EMPTY_DATA_STRING USERNAME [AMOUNT]"
 
@@ -101,6 +98,22 @@
 msgid "Data source query failed"
 msgstr "Data source query failed"
 
+#: src/modules/UserMetrics/Metric.cpp:28
+msgid "Failed to connect to metrics service:"
+msgstr "Failed to connect to metrics service:"
+
+#: src/modules/UserMetrics/Metric.cpp:115
+msgid "Failed to increment metric:"
+msgstr ""
+
+#: src/modules/UserMetrics/Metric.cpp:102
+msgid "Failed to register user metric:"
+msgstr "Failed to register user metric:"
+
+#: src/modules/UserMetrics/Metric.cpp:127
+msgid "Failed to update metric:"
+msgstr "Failed to update metric:"
+
 #: src/usermetricsservice/DBusUserData.cpp:132
 msgid "New data set could not be found"
 msgstr "New data set couldn't be found"

=== modified file 'po/libusermetrics.pot'
--- po/libusermetrics.pot	2013-09-25 10:12:27 +0000
+++ po/libusermetrics.pot	2013-09-26 15:27:09 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libusermetrics\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-25 11:09+0100\n"
+"POT-Creation-Date: 2013-09-26 16:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -111,6 +111,22 @@
 msgid "New data set could not be found"
 msgstr ""
 
+#: src/modules/UserMetrics/Metric.cpp:28
+msgid "Failed to connect to metrics service:"
+msgstr ""
+
+#: src/modules/UserMetrics/Metric.cpp:102
+msgid "Failed to register user metric:"
+msgstr ""
+
+#: src/modules/UserMetrics/Metric.cpp:115
+msgid "Failed to increment metric:"
+msgstr ""
+
+#: src/modules/UserMetrics/Metric.cpp:127
+msgid "Failed to update metric:"
+msgstr ""
+
 #: src/libusermetricsinput/main-increment.cpp:35
 #: src/libusermetricsinput/main.cpp:35
 msgid "Usage: "

=== modified file 'src/modules/UserMetrics/Metric.cpp'
--- src/modules/UserMetrics/Metric.cpp	2013-09-24 08:13:01 +0000
+++ src/modules/UserMetrics/Metric.cpp	2013-09-26 15:27:09 +0000
@@ -15,13 +15,18 @@
  */
 
 #include <modules/UserMetrics/Metric.h>
+#include <libusermetricscommon/Localisation.h>
 
+#include <stdexcept>
 #include <QDebug>
 
 Metric::Metric(QObject *parent) :
-		QObject(parent), m_metricManager(
-				UserMetricsInput::MetricManager::getInstance()), m_componentComplete(
-				false) {
+		QObject(parent), m_componentComplete(false) {
+	try {
+		m_metricManager.reset(UserMetricsInput::MetricManager::getInstance());
+	} catch (std::exception &e) {
+		qWarning() << _("Failed to connect to metrics service:") << e.what();
+	}
 }
 
 Metric::~Metric() {
@@ -88,27 +93,38 @@
 		return;
 	}
 
-	m_metric =
-			m_metricManager->add(
-					UserMetricsInput::MetricParameters(m_name).formatString(
-							m_format).emptyDataString(m_emptyFormat).textDomain(
-							m_domain));
-
-	if (m_metric.isNull()) {
-		qWarning() << "Failed to register user metric:" << m_name << "\""
-				<< m_format << "\"";
+	try {
+		m_metric = m_metricManager->add(
+				UserMetricsInput::MetricParameters(m_name).formatString(
+						m_format).emptyDataString(m_emptyFormat).textDomain(
+						m_domain));
+	} catch (std::exception &e) {
+		qWarning() << _("Failed to register user metric:") << m_name << "\""
+				<< m_format << "\": " << e.what();
 	}
 }
 
 void Metric::increment(double amount) {
-	if (!m_metric.isNull()) {
+	if (m_metric.isNull()) {
+		return;
+	}
+
+	try {
 		m_metric->increment(amount);
+	} catch (std::exception &e) {
+		qWarning() << _("Failed to increment metric:") << e.what();
 	}
 }
 
 void Metric::update(double value) {
-	if (!m_metric.isNull()) {
+	if (m_metric.isNull()) {
+		return;
+	}
+
+	try {
 		m_metric->update(value);
+	} catch (std::exception &e) {
+		qWarning() << _("Failed to update metric:") << e.what();
 	}
 }