Merge lp:~thomas-voss/dbus-cpp/fix-1361642 into lp:dbus-cpp

Proposed by Thomas Voß on 2014-10-02
Status: Merged
Merged at revision: 84
Proposed branch: lp:~thomas-voss/dbus-cpp/fix-1361642
Merge into: lp:dbus-cpp
Diff against target: 29 lines (+3/-3)
1 file modified
include/core/dbus/interfaces/properties.h (+3/-3)
To merge this branch: bzr merge lp:~thomas-voss/dbus-cpp/fix-1361642
Reviewer Review Type Date Requested Status
Antti Kaijanmäki (community) 2014-10-02 Needs Fixing on 2014-10-29
Jussi Pakkanen (community) 2014-10-02 Needs Fixing on 2014-10-02
PS Jenkins bot continuous-integration Approve on 2014-10-02
Review via email: mp+236820@code.launchpad.net

Commit message

Relax timeout on org.freedesktop.Properties::{GetAll, Get, Set}.

Description of the change

Relax timeout on org.freedesktop.Properties::{GetAll, Get, Set}.

To post a comment you must log in.
Jussi Pakkanen (jpakkane) wrote :

Instead of a magic number replicated in three different places, could you instead put it in a named constant?

review: Needs Fixing
Antti Kaijanmäki (kaijanmaki) wrote :

Let's fix the magic numbers later.

review: Approve
Antti Kaijanmäki (kaijanmaki) wrote :

Please, update the timeouts to 30 seconds, as that is what both qdbus and gdbus use by default.

Antti Kaijanmäki (kaijanmaki) wrote :

as agreed on irc, the timeouts should be increased to 30 secs to follow gdbus and qdbus.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/core/dbus/interfaces/properties.h'
2--- include/core/dbus/interfaces/properties.h 2014-01-20 21:22:02 +0000
3+++ include/core/dbus/interfaces/properties.h 2014-10-02 06:29:29 +0000
4@@ -45,7 +45,7 @@
5 };
6 inline static const std::chrono::milliseconds default_timeout()
7 {
8- return std::chrono::seconds{1};
9+ return std::chrono::seconds{10};
10 }
11 };
12
13@@ -59,7 +59,7 @@
14 };
15 inline static const std::chrono::milliseconds default_timeout()
16 {
17- return std::chrono::seconds{1};
18+ return std::chrono::seconds{10};
19 }
20 };
21
22@@ -73,7 +73,7 @@
23 };
24 inline static const std::chrono::milliseconds default_timeout()
25 {
26- return std::chrono::seconds{1};
27+ return std::chrono::seconds{10};
28 }
29 };
30

Subscribers

People subscribed via source and target branches