Merge lp:~jpakkane/indicator-network/moregrace into lp:indicator-network/14.10

[Jussi Pakkanen]

A few more graceful exits.

A few more graceful exits.

[lp:~jpakkane/indicator-network/moregrace]

418. By Jussi Pakkanen on 2014-08-28

Comment fixing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:417
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/174/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/48/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/174/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:418
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/175/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/49/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/175/rebuild

review: Approve (continuous-integration)

[Antti Kaijanmäki (kaijanmaki)]

LGTM.

review: Approve

[lp:~jpakkane/indicator-network/moregrace]

419. By Jussi Pakkanen on 2014-08-29

Expand scope of try/catch block.

[Jussi Pakkanen (jpakkane)]

Now with an even larger try/catch block.

=== modified file 'src/connectivity-cpp/src/platform/nmofono/manager.cpp'
--- src/connectivity-cpp/src/platform/nmofono/manager.cpp	2014-08-19 19:55:15 +0000
+++ src/connectivity-cpp/src/platform/nmofono/manager.cpp	2014-08-29 06:56:29 +0000
@@ -72,7 +72,15 @@
     m_bus->install_executor(executor);
     worker = std::move(std::thread([this]()
     {
-        m_bus->run();
+        try {
+            m_bus->run();
+        } catch(std::exception &e) {
+            /// @bug dbus-cpp internal logic exploded
+           // If this happens, indicator-network is in an unknown state with no clear way of
+           // recovering. The only reasonable way out is a graceful exit.
+           std::cerr << __PRETTY_FUNCTION__ << " Failed to run dbus service: " << e.what() << std::endl;
+           exit(0);
+        }
     }));
     location::set_name_for_thread(
                 worker,

=== modified file 'src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp'
--- src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp	2014-08-26 13:20:49 +0000
+++ src/connectivity-cpp/src/platform/nmofono/wifi/link.cpp	2014-08-29 06:56:29 +0000
@@ -324,42 +324,42 @@
 void
 Link::connect_to(std::shared_ptr<networking::wifi::AccessPoint> accessPoint)
 {
-    p->connecting = true;
-    std::vector<int8_t> ssid;
-    std::shared_ptr<GroupedAccessPoint> ap = std::dynamic_pointer_cast<GroupedAccessPoint>(accessPoint);
-    // The accesspoint interface does not provide this property so we need to coax it out of
-    // derived classes.
-    if(ap) {
-        ssid = ap->get_ap().ssid->get();
-    } else {
-        std::shared_ptr<AccessPoint> bap = std::dynamic_pointer_cast<AccessPoint>(accessPoint);
-        assert(bap);
-        ssid = bap->get_ap().ssid->get();
-    }
-    NM::Interface::Connection *found = nullptr;
-    auto connections = p->dev.get_available_connections();
-    for (auto &con : connections) {
-        for (auto map : con.get_settings()) {
-            if (map.first == "802-11-wireless") {
-                for (auto conf : map.second) {
-                    if (conf.first == "ssid") {
-                        std::vector<int8_t> value;
-                        value = conf.second.as<std::vector<std::int8_t>>();
-                        if (value == ap->get_ap().ssid->get()) {
-                            found = &con;
-                            break;
+    try {
+        p->connecting = true;
+        std::vector<int8_t> ssid;
+        std::shared_ptr<GroupedAccessPoint> ap = std::dynamic_pointer_cast<GroupedAccessPoint>(accessPoint);
+        // The accesspoint interface does not provide this property so we need to coax it out of
+        // derived classes.
+        if(ap) {
+            ssid = ap->get_ap().ssid->get();
+        } else {
+            std::shared_ptr<AccessPoint> bap = std::dynamic_pointer_cast<AccessPoint>(accessPoint);
+            assert(bap);
+            ssid = bap->get_ap().ssid->get();
+        }
+        NM::Interface::Connection *found = nullptr;
+        auto connections = p->dev.get_available_connections();
+        for (auto &con : connections) {
+            for (auto map : con.get_settings()) {
+                if (map.first == "802-11-wireless") {
+                    for (auto conf : map.second) {
+                        if (conf.first == "ssid") {
+                            std::vector<int8_t> value;
+                            value = conf.second.as<std::vector<std::int8_t>>();
+                            if (value == ap->get_ap().ssid->get()) {
+                                found = &con;
+                                break;
+                            }
                         }
                     }
                 }
             }
         }
-    }
-
-    /// @todo check the timestamps as there might be multiple ones that are suitable.
-    /// @todo oh, and check more parameters than just the ssid
-
-    core::dbus::types::ObjectPath ac;
-    try {
+
+        /// @todo check the timestamps as there might be multiple ones that are suitable.
+        /// @todo oh, and check more parameters than just the ssid
+
+        core::dbus::types::ObjectPath ac;
         if (found) {
             ac = p->nm.activate_connection(found->object->path(),
                     p->dev.object->path(),
@@ -378,6 +378,8 @@
                     ap->object_path());
             ac = std::get<1>(ret);
         }
+        updateActiveConnection(ac);
+        p->connecting = false;
     } catch(const std::exception &e) {
         // @bug default timeout expired: LP(#1361642)
         // If this happens, indicator-network is in an unknown state with no clear way of
@@ -385,8 +387,6 @@
         std::cerr << __PRETTY_FUNCTION__ << " Failed to activate connection: " << e.what() << std::endl;
         exit(0);
     }
-    updateActiveConnection(ac);
-    p->connecting = false;
 }
 
 const Property<std::shared_ptr<networking::wifi::AccessPoint> >&

=== modified file 'src/indicator/modem-manager.cpp'
--- src/indicator/modem-manager.cpp	2014-08-07 21:14:42 +0000
+++ src/indicator/modem-manager.cpp	2014-08-29 06:56:29 +0000
@@ -52,7 +52,17 @@
 
         auto executor = core::dbus::asio::make_executor(m_bus);
         m_bus->install_executor(executor);
-        m_ofonoWorker = std::move(std::thread([this](){ m_bus->run(); }));
+        m_ofonoWorker = std::move(std::thread([this](){
+            try {
+                m_bus->run();
+            } catch(std::exception &e) {
+                /// @bug dbus-cpp internal logic exploded
+                // If this happens, indicator-network is in an unknown state with no clear way of
+                // recovering. The only reasonable way out is a graceful exit.
+                std::cerr << __PRETTY_FUNCTION__ << " Failed to run dbus service: " << e.what() << std::endl;
+                exit(0);
+            }
+        }));
 
         m_dbus.reset(new core::dbus::DBus(m_bus));