1
=== modified file 'src/core/trust/daemon.cpp'
2
--- src/core/trust/daemon.cpp	2015-08-20 17:46:04 +0000
3
+++ src/core/trust/daemon.cpp	2015-08-27 14:08:17 +0000
4
@@ -16,6 +16,8 @@
5
16
 * Authored by: Thomas Voß <thomas.voss@canonical.com>
16
 * Authored by: Thomas Voß <thomas.voss@canonical.com>
6
17
 */
17
 */
7
18
18
8
19
#include <glog/logging.h>
9
20
10
19
#include <core/trust/daemon.h>
21
#include <core/trust/daemon.h>
11
20
22
12
21
#include <core/trust/app_id_formatting_trust_agent.h>
23
#include <core/trust/app_id_formatting_trust_agent.h>
13
@@ -101,12 +103,46 @@
14
101
        // We immediate execute the io_service instance
103
        // We immediate execute the io_service instance
15
102
        std::thread worker1
104
        std::thread worker1
16
103
        {
105
        {
18
104
            std::thread{[this]() { io_service.run(); }}
106
            std::thread{[this]() {
19
107
                while(true)
20
108
                {
21
109
                    try
22
110
                    {
23
111
                        io_service.run();
24
112
                        break; // run() exited normally
25
113
                    }
26
114
                    catch (const std::exception& e)
27
115
                    {
28
116
                        LOG(WARNING) << e.what();
29
117
                    }
30
118
                    catch (...)
31
119
                    {
32
120
                        LOG(WARNING) << "Unexpected exception was raised by the bus executor";
33
121
                    }
34
122
                } // while
35
123
            }} // thread
36
105
        };
124
        };
37
106
125
38
107
        std::thread worker2
126
        std::thread worker2
39
108
        {
127
        {
41
109
            std::thread{[this]() { io_service.run(); }}
128
            std::thread{[this]() {
42
129
                while(true)
43
130
                {
44
131
                    try
45
132
                    {
46
133
                        io_service.run();
47
134
                        break; // run() exited normally
48
135
                    }
49
136
                    catch (const std::exception& e)
50
137
                    {
51
138
                        LOG(WARNING) << e.what();
52
139
                    }
53
140
                    catch (...)
54
141
                    {
55
142
                        LOG(WARNING) << "Unexpected exception was raised by the bus executor";
56
143
                    }
57
144
                } // while
58
145
            }} // thread
59
110
        };
146
        };
60
111
    };
147
    };
61
112
148
62
@@ -397,7 +433,25 @@
63
397
433
64
398
    std::thread worker
434
    std::thread worker
65
399
    {
435
    {
67
400
        [configuration]() { configuration.bus->run(); }
436
        [configuration]()
68
437
        {
69
438
            while(true)
70
439
            {
71
440
                try
72
441
                {
73
442
                    configuration.bus->run();
74
443
                    break; // run() exited normally
75
444
                }
76
445
                catch (const std::exception& e)
77
446
                {
78
447
                    LOG(WARNING) << e.what();
79
448
                }
80
449
                catch (...)
81
450
                {
82
451
                    LOG(WARNING) << "Unexpected exception was raised by the bus executor";
83
452
                }
84
453
            }
85
454
        }
86
401
    };
455
    };
87
402
456
88
403
    // Expose the local store to the bus, keeping it exposed for the
457
    // Expose the local store to the bus, keeping it exposed for the
89
404
458
90
=== modified file 'src/core/trust/expose.cpp'
91
--- src/core/trust/expose.cpp	2014-08-04 07:57:05 +0000
92
+++ src/core/trust/expose.cpp	2015-08-27 14:08:17 +0000
93
@@ -16,6 +16,7 @@
94
16
 * Authored by: Thomas Voß <thomas.voss@canonical.com>
16
 * Authored by: Thomas Voß <thomas.voss@canonical.com>
95
17
 */
17
 */
96
18
18
97
19
#include <glog/logging.h>
98
19
#include <core/trust/expose.h>
20
#include <core/trust/expose.h>
99
20
21
100
21
#include <core/trust/store.h>
22
#include <core/trust/store.h>
101
@@ -99,7 +100,24 @@
102
99
            handle_remove_query(msg);
100
            handle_remove_query(msg);
103
100
        });
101
        });
104
101
102
106
102
        worker = std::move(std::thread([this](){Token::bus->run();}));
103
        worker = std::move(std::thread([this](){
107
104
            while(true)
108
105
            {
109
106
                try
110
107
                {
111
108
                    Token::bus->run();
112
109
                    break; // run() exited normally
113
110
                }
114
111
                catch (const std::exception& e)
115
112
                {
116
113
                    LOG(WARNING) << e.what();
117
114
                }
118
115
                catch (...)
119
116
                {
120
117
                    LOG(WARNING) << "Unexpected exception was raised by the bus executor";
121
118
                }
122
119
            }
123
120
        }));
124
103
    }
121
    }
125
104
122
126
105
    ~Token()
123
    ~Token()
127
106
124
128
=== modified file 'src/core/trust/resolve.cpp'
129
--- src/core/trust/resolve.cpp	2014-07-29 17:00:35 +0000
130
+++ src/core/trust/resolve.cpp	2015-08-27 14:08:17 +0000
131
@@ -16,6 +16,8 @@
132
16
 * Authored by: Thomas Voß <thomas.voss@canonical.com>
16
 * Authored by: Thomas Voß <thomas.voss@canonical.com>
133
17
 */
17
 */
134
18
18
135
19
#include <glog/logging.h>
136
20
137
19
#include <core/trust/resolve.h>
21
#include <core/trust/resolve.h>
138
20
22
139
21
#include <core/trust/request.h>
23
#include <core/trust/request.h>
140
@@ -52,7 +54,24 @@
141
52
    Store(const std::shared_ptr<dbus::Service>& service,
54
    Store(const std::shared_ptr<dbus::Service>& service,
142
53
          const std::shared_ptr<core::dbus::Bus>& bus)
55
          const std::shared_ptr<core::dbus::Bus>& bus)
143
54
        : bus(bus),
56
        : bus(bus),
145
55
          worker{[this]() { Store::bus->run(); }},
57
          worker{[this]() {
146
58
              while(true)
147
59
              {
148
60
                  try
149
61
                  {
150
62
                      Store::bus->run();
151
63
                      break; // run() exited normally
152
64
                  }
153
65
                  catch (const std::exception& e)
154
66
                  {
155
67
                      LOG(WARNING) << e.what();
156
68
                  }
157
69
                  catch (...)
158
70
                  {
159
71
                      LOG(WARNING) << "Unexpected exception was raised by the bus executor";
160
72
                  }
161
73
              }
162
74
          }},
163
56
          service(service),
75
          service(service),
164
57
          proxy(service->object_for_path(dbus::types::ObjectPath::root()))
76
          proxy(service->object_for_path(dbus::types::ObjectPath::root()))
165
58
    {
77
    {
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-08-27
Ken VanDine		2015-04-28	Approve on 2015-08-27
Review via email: mp+257690@code.launchpad.net