Merge lp:~stolowski/unity-scope-home/monitor-networking into lp:unity-scope-home

[Paweł Stołowski]

Monitor network availability on failures of remote-scopes query (on startup).

Monitor network availability on failures of remote-scopes query (on startup).
Set flush delay / category reorder time to 1,5s.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:93
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/16/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-raring-amd64-ci/18

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/16/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

8 +const int REMOTE_SCOPES_RETRY_INTERVAL_MAX_SECS = 60; //will retry after that many seconds tops

I think 600 would make more sense.

66 + request_remote_scopes_retry ();

Wouldn't it be better to start a tiny timer instead of trying right away?

[lp:~stolowski/unity-scope-home/monitor-networking]

94. By Paweł Stołowski on 2013-04-19

Increased max retry interval for remote-scopes query to 600 secs.
When network becomes avaiable, re-try the query after a small delay.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/unity-scope-home-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-home-raring-amd64-ci/19

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-scope-home-ci/17/rebuild

review: Approve (continuous-integration)

[Michal Hruby (mhr3)]

+1

review: Approve

=== modified file 'src/scope.vala'
--- src/scope.vala	2013-04-17 10:08:07 +0000
+++ src/scope.vala	2013-04-19 16:06:39 +0000
@@ -26,11 +26,12 @@
 const int METRICS_SEND_INTERVAL_SECS = 600;
 const int METRICS_MIN_NUM_EVENTS = 10;
 const int REMOTE_SCOPES_INITIAL_RETRY_INTERVAL_SECS = 2; //initial one, it will get increased with each retry
+const int REMOTE_SCOPES_RETRY_INTERVAL_MAX_SECS = 600; //will retry after that many seconds tops
 const uint SMART_SCOPES_RECOMMENDATIONS_CUTOFF = 5; //how many of the recommended scopes should be taken into account
 const int SMART_SCOPES_QUERY_MIN_DELAY_MS = 50;
 const int SMART_SCOPES_QUERY_MAX_DELAY_MS = 100;
-const int CATEGORY_REORDER_TIME_MS = 1000;
-const uint FLUSH_DELAY_MS = 500;
+const int CATEGORY_REORDER_TIME_MS = 1500;
+const uint FLUSH_DELAY_MS = 1500;
 const string[] ALWAYS_REORDER_SCOPE_IDS = {"applications.scope", "files.scope"};
 
 public class HomeScope : Unity.AggregatorScope
@@ -49,6 +50,9 @@
   private RemoteScopeRegistry remote_scope_registry;
   private uint category_reorder_time_ms = 0; // minimum time after which category reordering can happen (in milliseconds)
   private uint flush_delay_ms = 0; //minimum time after which results will be shown in the dash (in milliseconds)
+  private NetworkMonitor? netmon = null;
+  private bool remote_scopes_request_running = false;
+  private ulong netmon_sig_id = 0;
 
   public HomeScope ()
   {
@@ -184,6 +188,11 @@
 
   internal async void request_remote_scopes ()
   {
+    if (remote_scopes_request_running || smart_scopes_ready)
+      return;
+
+    remote_scopes_request_running = true;
+
     SmartScopes.RemoteScopeInfo[]? scopes = null;
     // issue a request for remote_scopes list
     try
@@ -215,11 +224,49 @@
     {
       warning ("Failed to get list of remote scopes: %s", e.message);
     }
+    remote_scopes_request_running = false;
 
     if (!smart_scopes_ready)
     {
-      // setup a retry callback
-      GLib.Timeout.add_seconds (REMOTE_SCOPES_INITIAL_RETRY_INTERVAL_SECS * ++remote_scopes_retry_count, request_remote_scopes_retry);
+      bool network_available = GLib.NetworkMonitor.get_default ().network_available;
+
+      // if network not available, monitor it and re-try when it becomes available
+      if (netmon == null && !network_available)
+      {
+        debug ("Network not available, creating netmon");
+
+        netmon = GLib.NetworkMonitor.get_default ();
+        netmon_sig_id = netmon.network_changed.connect ((available) =>
+        {
+          // note: we get network_changed notification multiple times, 
+          // remote_scopes_request_running ensures we retry once at a time.
+          if (available && !smart_scopes_ready && !remote_scopes_request_running)
+          {
+            remote_scopes_retry_count = 0;
+            // just retry after small initial delay (don't multiply by num of failures)
+            GLib.Timeout.add_seconds (REMOTE_SCOPES_INITIAL_RETRY_INTERVAL_SECS, request_remote_scopes_retry);
+          }
+        });
+      }
+
+      // network considered available but for some reason remote-scopes query failed - setup a retry after timeout
+      if (network_available)
+      {
+        var retry_delay = int.min (REMOTE_SCOPES_INITIAL_RETRY_INTERVAL_SECS * ++remote_scopes_retry_count,
+                                   REMOTE_SCOPES_RETRY_INTERVAL_MAX_SECS);
+        debug ("Network is available, will retry in %d secs", retry_delay);
+        GLib.Timeout.add_seconds (retry_delay, request_remote_scopes_retry);
+      }
+    }
+    else
+    {
+      // once we got remote-scopes, disconnect and remove netmon
+      if (netmon != null)
+      {
+        SignalHandler.disconnect (netmon, netmon_sig_id);
+        netmon = null;
+        netmon_sig_id = 0;
+      }
     }
   }