Merge lp:~albaguirre/trust-store/fix-1377159 into lp:trust-store

[Alberto Aguirre]

Attempt mir connection more than once

Attempt mir connection more than once

This workarounds a race when unity8 is restarted, which I suppose restarts the ubuntu-location-service-trust-stored service but unity8's mirserver is not ready yet for connections.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:44
http://jenkins.qa.ubuntu.com/job/trust-store-ci/69/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/69
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/69
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/69/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/69

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/69/rebuild

review: Approve (continuous-integration)

[lp:~albaguirre/trust-store/fix-1377159]

45. By Alberto Aguirre on 2014-10-04

Catch all exceptions during configuration.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:45
http://jenkins.qa.ubuntu.com/job/trust-store-ci/70/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-amd64-ci/70
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/trust-store-utopic-i386-ci/70

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/trust-store-ci/70/rebuild

review: Approve (continuous-integration)

[lp:~albaguirre/trust-store/fix-1377159]

46. By Alberto Aguirre on 2014-10-06

add TODO for logging reconnection attempts

[Thomas Voß (thomas-voss)]

LGTM.

review: Approve

=== modified file 'include/core/trust/mir_agent.h'
--- include/core/trust/mir_agent.h	2014-08-06 10:06:43 +0000
+++ include/core/trust/mir_agent.h	2014-10-06 14:47:15 +0000
@@ -22,6 +22,7 @@
 #include <core/trust/visibility.h>
 
 #include <memory>
+#include <stdexcept>
 
 // Forward declare the MirConnection type.
 struct MirConnection;
@@ -35,6 +36,15 @@
 
 namespace mir
 {
+
+class InvalidMirConnection : public std::runtime_error
+{
+public:
+    explicit InvalidMirConnection(const char* what_arg)
+        : std::runtime_error(what_arg)
+    {}
+};
+
 /**
  * @brief Helper function building up a connection to Mir.
  * @param endpoint The name of the endpoint exposed by the Mir instance.
@@ -46,7 +56,7 @@
 /**
  * @brief create_agent_for_mir_connection creates a trust::Agent implementation leveraging Mir's trusted prompting API.
  * @param connection An existing connection to a Mir instance.
- * @throws std::logic_error if the connection object is NULL.
+ * @throws InvalidMirConnection if the connection object is invalid.
  */
 CORE_TRUST_DLL_PUBLIC std::shared_ptr<core::trust::Agent> create_agent_for_mir_connection(MirConnection* connection);
 }

=== modified file 'src/core/trust/daemon.cpp'
--- src/core/trust/daemon.cpp	2014-08-26 14:50:22 +0000
+++ src/core/trust/daemon.cpp	2014-10-06 14:47:15 +0000
@@ -41,6 +41,7 @@
 #include <boost/program_options.hpp>
 
 #include <thread>
+#include <chrono>
 
 namespace Options = boost::program_options;
 
@@ -193,12 +194,25 @@
 
                 auto trusted_mir_socket = dict.at("trusted-mir-socket");
 
-                auto agent = core::trust::mir::create_agent_for_mir_connection(
-                            core::trust::mir::connect(
-                                trusted_mir_socket,
-                                service_name));
-
-                return agent;
+                // TODO: log reconnection attempts
+                int connection_attempts = 5;
+                while (true)
+                {
+                    try
+                    {
+                        return core::trust::mir::create_agent_for_mir_connection(
+                                    core::trust::mir::connect(
+                                        trusted_mir_socket,
+                                        service_name));
+                    }
+                    catch (core::trust::mir::InvalidMirConnection const&)
+                    {
+                        if (--connection_attempts == 0)
+                            throw;
+                    }
+                    std::this_thread::sleep_for(std::chrono::seconds(1));
+                    std::cerr << "reattempt connection to mir..."<< std::endl;
+                }
             }
         },
         {

=== modified file 'src/core/trust/daemon_skeleton_main.cpp'
--- src/core/trust/daemon_skeleton_main.cpp	2014-08-13 13:44:10 +0000
+++ src/core/trust/daemon_skeleton_main.cpp	2014-10-06 14:47:15 +0000
@@ -31,7 +31,7 @@
     try
     {
         configuration = core::trust::Daemon::Skeleton::Configuration::from_command_line(argc, argv);
-    } catch(const boost::exception& e)
+    } catch(std::exception const& e)
     {
         std::cerr << "Error during initialization and startup: " << boost::diagnostic_information(e) << std::endl;
         return EXIT_FAILURE;

=== modified file 'src/core/trust/mir/agent.cpp'
--- src/core/trust/mir/agent.cpp	2014-09-18 21:07:05 +0000
+++ src/core/trust/mir/agent.cpp	2014-10-06 14:47:15 +0000
@@ -17,8 +17,8 @@
  */
 
 #include "agent.h"
-
 #include "prompt_main.h"
+#include <core/trust/mir_agent.h>
 
 // For getuid
 #include <fcntl.h>
@@ -90,7 +90,7 @@
 mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection* connection)
     : connection{connection}
 {
-    if (mir_connection_is_valid(connection) == mir_false) throw std::runtime_error
+    if (mir_connection_is_valid(connection) == mir_false) throw InvalidMirConnection
     {
         "Cannot create instance for invalid connection to Mir."
     };
@@ -267,8 +267,6 @@
     return std::tie(lhs.application_id, lhs.description, lhs.fd) == std::tie(rhs.application_id, rhs.description, rhs.fd);
 }
 
-#include <core/trust/mir_agent.h>
-
 #include "config.h"
 
 MirConnection* mir::connect(const std::string& endpoint, const std::string& name)