qtubuntu

Merge lp:~gerboland/qtubuntu/quit-gracefully-on-no-mirconnection into lp:qtubuntu

quit-gracefully-on-no-mirconnection
Merge into trunk

Proposed by Gerry Boland on 2017-01-12

Status:

Merged

Approved by:

Daniel d'Andrada on 2017-01-18

Approved revision:

364

Merged at revision:

365

Proposed branch:

lp:~gerboland/qtubuntu/quit-gracefully-on-no-mirconnection

Merge into:

lp:qtubuntu

Diff against target:

35 lines (+12/-5)

1 file modified

src/ubuntumirclient/integration.cpp (+12/-5)

To merge this branch:

bzr merge lp:~gerboland/qtubuntu/quit-gracefully-on-no-mirconnection

Undecided

Invalid

Link a bug report

Reviewer	Review Type	Date Requested	Status
Daniel d'Andrada (community)		2017-01-12	Approve on 2017-01-18
Unity8 CI Bot	continuous-integration		Approve on 2017-01-12
Review via email: mp+314618@code.launchpad.net

Commit message

Quit gracefully if Mir connection failed

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-12:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/169/rebuild

review: Approve (continuous-integration)

lp:~gerboland/qtubuntu/quit-gracefully-on-no-mirconnection updated on 2017-01-12

363. By Gerry Boland on 2017-01-12: Get Mir's error message
364. By Gerry Boland on 2017-01-12: Clarify comment a bit

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2017-01-12:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/170/rebuild

review: Approve (continuous-integration)

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2017-01-18:

Looks ok. Might worth checking if the connection attempt to extract the error message was successful (who knows?)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Gerry Boland

Ubuntu Phablet Team

 === modified file 'src/ubuntumirclient/integration.cpp'
 --- src/ubuntumirclient/integration.cpp	2016-12-01 22:28:20 +0000
 +++ src/ubuntumirclient/integration.cpp	2017-01-12 13:55:02 +0000
@@ -75,20 +75,27 @@
      , mAppStateController(new UbuntuAppStateController)
      , mScaleFactor(1.0)
+ {
++    QByteArray sessionName;
+     {
          QStringList args = QCoreApplication::arguments();
          setupOptions(args);
--        QByteArray sessionName = generateSessionName(args);
++        sessionName = generateSessionName(args);
          setupDescription(sessionName);
+     }
      // Create new application instance
      mInstance = u_application_instance_new_from_description_with_options(mDesc, mOptions);
--    if (mInstance == nullptr)
--        qFatal("UbuntuClientIntegration: connection to Mir server failed. Check that a Mir server is\n"
--               "running, and the correct socket is being used and is accessible. The shell may have\n"
--               "rejected the incoming connection, so check its log file");
++    if (mInstance == nullptr) {
++        qCritical("[QPA] UbuntuClientIntegration: connection to Mir server failed.\n");
++
++        // TODO: add API to platform-api to fetch Mir's error message (bug:1655970).
++        // Workaround by retrying the connection here in order to get the message.
++        auto mirConnection = mir_connect_sync(nullptr, sessionName.data());
++        qCritical("Mir returned: \"%s\"", mir_connection_get_error_message(mirConnection));
++        mir_connection_release(mirConnection);
++        exit(EXIT_FAILURE);
++    }
      mMirConnection = u_application_instance_get_mir_connection(mInstance);

qtubuntu

Merge lp:~gerboland/qtubuntu/quit-gracefully-on-no-mirconnection into lp:qtubuntu

Commit message

Description of the change

Preview Diff

Subscribers