libusermetrics

Merge lp:~unity-api-team/libusermetrics/dont-share-dbus-connections into lp:libusermetrics

  1. dont-share-dbus-connections
  2. Merge into trunk
Proposed by Pete Woods on 2015-04-27
Status: Merged
Merged at revision: 193
Proposed branch: lp:~unity-api-team/libusermetrics/dont-share-dbus-connections
Merge into: lp:libusermetrics
Diff against target: 83 lines (+9/-9)
6 files modified
src/libusermetricsinput/MetricManager.cpp (+2/-1)
src/libusermetricsoutput/UserMetrics.cpp (+2/-1)
src/usermetricsservice/DBusDataSet.cpp (+1/-2)
src/usermetricsservice/DBusDataSource.cpp (+1/-2)
src/usermetricsservice/DBusUserData.cpp (+1/-2)
src/usermetricsservice/main.cpp (+2/-1)
To merge this branch: bzr merge lp:~unity-api-team/libusermetrics/dont-share-dbus-connections
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-04-27
Unity Team 2015-04-27 Pending
Review via email: mp+257497@code.launchpad.net

Commit Message

Stop using shared DBus connections

Description of the Change

Stop using shared DBus connections

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
lp:~unity-api-team/libusermetrics/dont-share-dbus-connections updated on 2015-04-27
194. By Pete Woods on 2015-04-27

Change incorrect path removals from session bus to system bus

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/libusermetricsinput/MetricManager.cpp'
2--- src/libusermetricsinput/MetricManager.cpp 2013-07-02 14:26:11 +0000
3+++ src/libusermetricsinput/MetricManager.cpp 2015-04-27 13:24:52 +0000
4@@ -32,7 +32,8 @@
5 }
6
7 MetricManager * MetricManager::getInstance() {
8- QDBusConnection dbusConnection(QDBusConnection::systemBus());
9+ QDBusConnection dbusConnection(QDBusConnection::connectToBus(
10+ QDBusConnection::SystemBus, "libusermetricsinput-systembus"));
11
12 QDBusConnectionInterface* interface = dbusConnection.interface();
13 if (!interface->isServiceRegistered(DBusPaths::serviceName())) {
14
15=== modified file 'src/libusermetricsoutput/UserMetrics.cpp'
16--- src/libusermetricsoutput/UserMetrics.cpp 2013-09-20 12:20:49 +0000
17+++ src/libusermetricsoutput/UserMetrics.cpp 2015-04-27 13:24:52 +0000
18@@ -33,7 +33,8 @@
19 }
20
21 UserMetrics * UserMetrics::getInstance() {
22- QDBusConnection dbusConnection(QDBusConnection::systemBus());
23+ QDBusConnection dbusConnection(QDBusConnection::connectToBus(
24+ QDBusConnection::SystemBus, "libusermetricsoutput-systembus"));
25
26 return new UserMetricsImpl(
27 QSharedPointer<DateFactory>(new DateFactoryImpl()),
28
29=== modified file 'src/usermetricsservice/DBusDataSet.cpp'
30--- src/usermetricsservice/DBusDataSet.cpp 2013-10-22 08:53:23 +0000
31+++ src/usermetricsservice/DBusDataSet.cpp 2015-04-27 13:24:52 +0000
32@@ -49,8 +49,7 @@
33 }
34
35 DBusDataSet::~DBusDataSet() {
36- QDBusConnection connection(QDBusConnection::sessionBus());
37- connection.unregisterObject(m_path);
38+ m_dbusConnection.unregisterObject(m_path);
39 }
40
41 void DBusDataSet::getData(DataSet &dataSet, QVariantList &data) {
42
43=== modified file 'src/usermetricsservice/DBusDataSource.cpp'
44--- src/usermetricsservice/DBusDataSource.cpp 2015-01-29 12:37:39 +0000
45+++ src/usermetricsservice/DBusDataSource.cpp 2015-04-27 13:24:52 +0000
46@@ -44,8 +44,7 @@
47 }
48
49 DBusDataSource::~DBusDataSource() {
50- QDBusConnection connection(QDBusConnection::sessionBus());
51- connection.unregisterObject(m_path);
52+ m_dbusConnection.unregisterObject(m_path);
53 }
54
55 QString DBusDataSource::path() const {
56
57=== modified file 'src/usermetricsservice/DBusUserData.cpp'
58--- src/usermetricsservice/DBusUserData.cpp 2014-01-20 10:33:36 +0000
59+++ src/usermetricsservice/DBusUserData.cpp 2015-04-27 13:24:52 +0000
60@@ -56,8 +56,7 @@
61 }
62
63 DBusUserData::~DBusUserData() {
64- QDBusConnection connection(QDBusConnection::sessionBus());
65- connection.unregisterObject(m_path);
66+ m_dbusConnection.unregisterObject(m_path);
67 }
68
69 QString DBusUserData::path() const {
70
71=== modified file 'src/usermetricsservice/main.cpp'
72--- src/usermetricsservice/main.cpp 2015-01-29 12:37:39 +0000
73+++ src/usermetricsservice/main.cpp 2015-04-27 13:24:52 +0000
74@@ -68,7 +68,8 @@
75
76 QDjango::setDatabase(db);
77
78- QDBusConnection connection(QDBusConnection::systemBus());
79+ QDBusConnection connection(QDBusConnection::connectToBus(
80+ QDBusConnection::SystemBus, "usermetrics-systembus"));
81
82 QSharedPointer<DateFactory> dateFactory(new DateFactoryImpl());
83 QSharedPointer<Authentication> authentication(new Authentication());

Subscribers

People subscribed via source and target branches

to all changes: