Merge lp:~alan-griffiths/mir/fix-1728581 into lp:mir

[Alan Griffiths]

[mir_demo_server] extend (not replace) the default error reporting. (LP: #1728581)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4306
https://mir-jenkins.ubuntu.com/job/mir-ci/3764/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5187
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5424
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5411
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5411
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5411
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5230/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5230/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5230/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5230/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5230/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5230/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5230/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5230
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5230/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3764/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

Please resubmit on github: https://github.com/MirServer/mir/tree/fix-1728581

review: Needs Resubmitting

Unmerged revisions

4306. By Alan Griffiths on 2017-10-31

[mir_demo_server] extend (not replace) the default error reporting

=== modified file 'examples/server_example.cpp'
--- examples/server_example.cpp	2017-08-25 16:52:18 +0000
+++ examples/server_example.cpp	2017-10-31 10:51:28 +0000
@@ -92,6 +92,7 @@
 void exception_handler()
 try
 {
+    mir::report_exception();
     throw;
 }
 catch (mir::AbnormalExit const& /*error*/)
@@ -112,12 +113,9 @@
         fwrite(value.c_str(), value.size(), 1, output);
         pclose(output);
     }
-
-    mir::report_exception();
 }
 catch (...)
 {
-    mir::report_exception();
 }
 }