Merge lp:~robertcarr/mir/socket-messenger-reporting into lp:mir
Proposed by
Robert Carr
Status: | Superseded |
---|---|
Proposed branch: | lp:~robertcarr/mir/socket-messenger-reporting |
Merge into: | lp:mir |
Diff against target: |
573 lines (+279/-13) 17 files modified
debian/changelog (+8/-2) include/server/mir/default_server_configuration.h (+3/-0) include/server/mir/frontend/connector_report.h (+0/-1) include/server/mir/frontend/messenger_report.h (+49/-0) include/server/mir/frontend/protobuf_ipc_factory.h (+3/-1) include/server/mir/logging/messenger_report.h (+49/-0) include/test/mir_test_doubles/stub_ipc_factory.h (+6/-1) src/server/default_server_configuration.cpp (+31/-3) src/server/frontend/CMakeLists.txt (+1/-0) src/server/frontend/null_messenger_report.cpp (+25/-0) src/server/frontend/protobuf_session_creator.cpp (+2/-2) src/server/frontend/socket_messenger.cpp (+11/-2) src/server/frontend/socket_messenger.h (+6/-1) src/server/logging/CMakeLists.txt (+1/-0) src/server/logging/messenger_report.cpp (+46/-0) tests/unit-tests/frontend/CMakeLists.txt (+1/-0) tests/unit-tests/frontend/test_socket_messenger.cpp (+37/-0) |
To merge this branch: | bzr merge lp:~robertcarr/mir/socket-messenger-reporting |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Alan Griffiths | Needs Fixing | ||
Daniel van Vugt | Pending | ||
Review via email: mp+187822@code.launchpad.net |
This proposal supersedes a proposal from 2013-09-23.
This proposal has been superseded by a proposal from 2013-09-26.
Commit message
Add messenger report and report socket messenger write errors.
Description of the change
Report socket messenger write errors so we can keep track of this.
To post a comment you must log in.
Unmerged revisions
- 1077. By Robert Carr
-
Merge development branch
- 1076. By Robert Carr
-
Update tests
- 1075. By Robert Carr
-
Merge trunk and update to new frontend interfaces
- 1074. By Robert Carr
-
Typo
- 1073. By Robert Carr
-
socket_messenger: Report exceptions
- 1072. By Daniel van Vugt
-
Stop asio::write from throwing exceptions (SIGPIPE). It will only do so
after we've closed the socket, at which point we don't really care.
(LP: #1226139)
[ try] whole_message) );
9 {
50 ba::write(*socket, ba::buffer(
51 }
52 - catch (std::exception &)
53 + catch (std::exception &ex)
54 {
55 - // Don't care
56 + report->error(ex);
57 }
This is better written as:
boost: :system: :error_ code ec; :write( *socket, ba::buffer( whole_message) , ec);
ba:
if (!ec)
report- >error( ec.message( ));
{
}
And not throwing and catching exceptions.