Merge lp:~sergiusens/account-polld/reset_poll into lp:~phablet-team/account-polld/trunk

[Sergio Schvezov]

Reset poll on success even when no new notifications come in.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/account-polld-ci/24/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/24

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/account-polld-ci/24/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

I understand the existing behaviour is a bit suspect, but don't we also want to back off a bit when there are no notifications for a while?

[Sergio Schvezov (sergiusens)]

On lunes 28 de julio de 2014 05h'20:43 ART, James Henstridge wrote:
> I understand the existing behaviour is a bit suspect, but don't
> we also want to back off a bit when there are no notifications
> for a while?

I thought so as well, but after continous use over the weekend it was sort
of annoying - I'm a dogfooder as well :)

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'cmd/account-polld/account_manager.go'
--- cmd/account-polld/account_manager.go	2014-07-25 20:06:04 +0000
+++ cmd/account-polld/account_manager.go	2014-07-27 17:43:21 +0000
@@ -117,10 +117,12 @@
 			a.watcher.Refresh(a.authData.AccountId)
 			a.authData.Enabled = false
 		}
-	} else if len(n) > 0 {
+	} else {
+		if len(n) > 0 {
+			a.postWatch <- &PostWatch{messages: n, appId: a.plugin.ApplicationId()}
+		}
 		// on success we reset the timeout to the default interval
 		a.interval = pollInterval
-		a.postWatch <- &PostWatch{messages: n, appId: a.plugin.ApplicationId()}
 	}
 }