Mir

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

  1. fix-1190165
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Kevin DuBois
Approved revision: no longer in the source branch.
Merged at revision: 3211
Proposed branch: lp:~alan-griffiths/mir/fix-1190165
Merge into: lp:mir
Diff against target: 24 lines (+2/-2)
1 file modified
src/platform/options/program_option.cpp (+2/-2)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1190165
Reviewer Review Type Date Requested Status
Kevin DuBois (community) Approve
Andreas Pokorny (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+280959@code.launchpad.net

Commit message

platform: Use logging API, not cerr to report problems parsing config files

Description of the change

platform: Use logging API, not cerr to report problems parsing config files

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3208
http://jenkins.qa.ubuntu.com/job/mir-ci/5894/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5376/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4283/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5329/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/211/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/220
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/220/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/220
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/220/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5326/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/207
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/207/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/63/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26243

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5894/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:3209
http://jenkins.qa.ubuntu.com/job/mir-ci/5897/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/5380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/4287
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/5333
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-xenial-touch/215
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/223
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-amd64-ci/223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/223
        deb: http://jenkins.qa.ubuntu.com/job/mir-xenial-i386-ci/223/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5330
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/5330/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7838
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26261
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/211
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-xenial-armhf/211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-xenial-touch/68
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/26260

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/5897/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andreas Pokorny (andreas-pokorny) wrote :

sure

review: Approve
Revision history for this message
Kevin DuBois (kdub) wrote :

lgmt

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platform/options/program_option.cpp'
2--- src/platform/options/program_option.cpp 2015-02-22 07:46:25 +0000
3+++ src/platform/options/program_option.cpp 2015-12-18 16:48:41 +0000
4@@ -17,11 +17,11 @@
5 */
6
7 #include "mir/options/program_option.h"
8+#include "mir/log.h"
9
10 #include <boost/program_options/parsers.hpp>
11
12 #include <fstream>
13-#include <iostream>
14 #include <locale>
15
16 namespace mo = mir::options;
17@@ -112,7 +112,7 @@
18 }
19 catch (const po::error& error)
20 {
21- std::cerr << "ERROR in " << filename << ": " << error.what() << std::endl;
22+ log_warning("Error in %s: %s", filename.c_str(), error.what());
23 }
24 }
25

Subscribers

People subscribed via source and target branches