Merge lp:~mhr3/unity-lens-applications/improve-error-handling into lp:unity-lens-applications

[Michal Hruby]

Improve error handling, which can cause the scope searches to lock up.

Improve error handling, which can cause the scope searches to lock up.

[Paweł Stołowski (stolowski)]

67 + catch (Error err)
68 + {
69 + critical ("Unable to export scope: %s", err.message);
70 + }

I think inability to export scope should result in a fatal and stop the process, there's not point in keeping it running. Or it's not the case?

review: Needs Information

[Michal Hruby (mhr3)]

> 67 + catch (Error err)
> 68 + {
> 69 + critical ("Unable to export scope: %s", err.message);
> 70 + }
>
> I think inability to export scope should result in a fatal and stop the
> process, there's not point in keeping it running. Or it's not the case?

And that's why it's a critical and not a warning :)

[lp:~mhr3/unity-lens-applications/improve-error-handling]

350. By Michal Hruby on 2013-07-01

Abort when scope can't be exported

[Paweł Stołowski (stolowski)]

Looks fine now. +1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/unity-lens-applications-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-armhf-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-applications-saucy-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-applications-ci/19/rebuild

review: Approve (continuous-integration)

=== modified file 'src/app-watcher.vala'
--- src/app-watcher.vala	2012-01-18 17:02:52 +0000
+++ src/app-watcher.vala	2013-07-01 12:18:28 +0000
@@ -51,24 +51,31 @@
                                      Path.DIR_SEPARATOR_S, null);
       }
 
-      var connection = Bus.get_sync (BusType.SESSION);
-      connection.signal_subscribe ("org.ayatana.bamf",
-                                   "org.ayatana.bamf.matcher",
-                                   "RunningApplicationsChanged",
-                                   "/org/ayatana/bamf/matcher",
-                                   null,
-                                   DBusSignalFlags.NONE,
-                                   this.running_apps_changed);
-      connection.call.begin ("org.ayatana.bamf",
-                             "/org/ayatana/bamf/matcher",
-                             "org.ayatana.bamf.matcher",
-                             "RunningApplicationsDesktopFiles",
-                             null,
-                             null,
-                             0,
-                             -1,
-                             null,
-                             this.got_running_apps);
+      try
+      {
+        var connection = Bus.get_sync (BusType.SESSION);
+        connection.signal_subscribe ("org.ayatana.bamf",
+                                     "org.ayatana.bamf.matcher",
+                                     "RunningApplicationsChanged",
+                                     "/org/ayatana/bamf/matcher",
+                                     null,
+                                     DBusSignalFlags.NONE,
+                                     this.running_apps_changed);
+        connection.call.begin ("org.ayatana.bamf",
+                               "/org/ayatana/bamf/matcher",
+                               "org.ayatana.bamf.matcher",
+                               "RunningApplicationsDesktopFiles",
+                               null,
+                               null,
+                               0,
+                               -1,
+                               null,
+                               this.got_running_apps);
+      }
+      catch (Error err)
+      {
+        warning ("Unable to get running applications: %s", err.message);
+      }
     }
 
     private void got_running_apps (Object? src_obj,

=== modified file 'src/daemon.vala'
--- src/daemon.vala	2013-06-20 13:11:17 +0000
+++ src/daemon.vala	2013-07-01 12:18:28 +0000
@@ -235,7 +235,14 @@
       aptdclient = new AptdProxy ();
       launcherservice = new LauncherProxy ();
 
-      scope.export ();
+      try
+      {
+        scope.export ();
+      }
+      catch (Error err)
+      {
+        error ("Unable to export scope: %s", err.message);
+      }
 
       remote_scopes_model = new Dee.SharedModel ("com.canonical.Unity.SmartScopes.RemoteScopesModel");
       remote_scopes_model.set_schema ("s", "s", "s", "s", "s", "as");
@@ -285,21 +292,26 @@
                                         SearchType search_type,
                                         GLib.Cancellable cancellable)
     {
-      if (popularities_dirty)
-      {
-        popularities_dirty = false;
-        // we're not passing the cancellable, cause cancelling this search
-        // shouldn't cancel getting most popular apps
-        yield update_popularities ();
-        if (cancellable.is_cancelled ()) return;
-      }
-
-      if (search_type == SearchType.DEFAULT)
-        yield update_scope_search (search, cancellable);
-      else
-        yield update_global_search (search, cancellable);
-
-      search.finished ();
+      try
+      {
+        if (popularities_dirty)
+        {
+          popularities_dirty = false;
+          // we're not passing the cancellable, cause cancelling this search
+          // shouldn't cancel getting most popular apps
+          yield update_popularities ();
+          if (cancellable.is_cancelled ()) return;
+        }
+
+        if (search_type == SearchType.DEFAULT)
+          yield update_scope_search (search, cancellable);
+        else
+          yield update_global_search (search, cancellable);
+      }
+      finally
+      {
+        search.finished ();
+      }
     }
 
     private void populate_categories ()
@@ -438,11 +450,18 @@
 
     private async void build_scope_index ()
     {
-      var scope_registry = yield Unity.Protocol.ScopeRegistry.find_scopes (
-        Config.PKGDATADIR + "/scopes");
+      try
+      {
+        var scope_registry = yield Unity.Protocol.ScopeRegistry.find_scopes (
+          Config.PKGDATADIR + "/scopes");
 
-      debug ("Indexing scopes");
-      scopesearcher = new Unity.Package.Searcher.for_scopes (scope_registry);
+        debug ("Indexing scopes");
+        scopesearcher = new Unity.Package.Searcher.for_scopes (scope_registry);
+      }
+      catch (Error err)
+      {
+        warning ("Unable to find scopes: %s", err.message);
+      }
     }
 
     private void populate_zg_templates ()
@@ -598,7 +617,15 @@
         }
       }
 
-      transaction.commit ();
+      // FIXME: use the new API and ResultSet.flush () instead
+      try
+      {
+        transaction.commit ();
+      }
+      catch (Error err)
+      {
+        warning ("Unable to commit transaction: %s", err.message);
+      }
 
       // add scopes (if filter is active)
       if (!has_filter || type_filter.get_option ("scopes").active)
@@ -974,12 +1001,13 @@
           bool x_ubuntu_touch = false;
           if (full_path != null)
           {
-            GLib.KeyFile key_file = new GLib.KeyFile();
-            key_file.load_from_file(full_path, GLib.KeyFileFlags.NONE);
-            try {
-              x_ubuntu_touch = key_file.get_boolean("Desktop Entry", "X-Ubuntu-Touch");
+            GLib.KeyFile key_file = new GLib.KeyFile ();
+            try
+            {
+              key_file.load_from_file (full_path, GLib.KeyFileFlags.NONE);
+              x_ubuntu_touch = key_file.get_boolean ("Desktop Entry", "X-Ubuntu-Touch");
             }
-            catch (GLib.KeyFileError e)
+            catch (Error e)
             {
               x_ubuntu_touch = false;
             }
@@ -1238,7 +1266,7 @@
               launcherservice.connect_to_launcher ();
               string desktop_file = preview_installable_desktop_file;
               Icon icon = find_pkg_icon (null, preview_installable_icon_file);
-              launcherservice.add_launcher_item_from_position (appname, icon.to_string (), 0, 0, 32, desktop_file, tid);
+              launcherservice.add_launcher_item_from_position.begin (appname, icon.to_string (), 0, 0, 32, desktop_file, tid);
             }
             catch (IOError e)
             {

=== modified file 'src/main.vala'
--- src/main.vala	2013-05-16 11:37:05 +0000
+++ src/main.vala	2013-07-01 12:18:28 +0000
@@ -43,7 +43,7 @@
                                       -1);
       result.get ("(b)", out has_owner);
       return has_owner;
-    } catch (IOError e) {
+    } catch (Error e) {
       warning ("Unable to decide whether '%s' is running: %s", name, e.message);
     }
     

=== modified file 'src/runner.vala'
--- src/runner.vala	2013-06-11 11:08:47 +0000
+++ src/runner.vala	2013-07-01 12:18:28 +0000
@@ -90,7 +90,14 @@
 
       this.daemon = daemon;
 
-      scope.export ();
+      try
+      {
+        scope.export ();
+      }
+      catch (Error err)
+      {
+        error ("Unable to export scope: %s", err.message);
+      }
     }
 
     private void populate_categories ()

=== modified file 'src/utils.vala'
--- src/utils.vala	2013-05-16 11:37:05 +0000
+++ src/utils.vala	2013-07-01 12:18:28 +0000
@@ -165,7 +165,7 @@
     });
     out_analyzer = analyzer;
 
-    var reader = Dee.ModelReader.new (reader_func);
+    var reader = Dee.ModelReader.new ((owned) reader_func);
     return new Dee.TreeIndex (filter_model, analyzer, reader);
   }