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

[Sergio Schvezov]

Setting the interval to a more reasonable value. Allowing to override on start with an envvar

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:18
http://jenkins.qa.ubuntu.com/job/account-polld-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-amd64-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-armhf-ci/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/account-polld-utopic-i386-ci/8/console

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

review: Needs Fixing (continuous-integration)

[lp:~sergiusens/account-polld/interval]

19. By Sergio Schvezov on 2014-07-24

Merged click_poll_check into interval.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'cmd/account-polld/account_manager.go'
--- cmd/account-polld/account_manager.go	2014-07-24 21:16:18 +0000
+++ cmd/account-polld/account_manager.go	2014-07-24 21:16:18 +0000
@@ -19,6 +19,8 @@
 
 import (
 	"log"
+	"os"
+	"strconv"
 	"sync"
 	"time"
 
@@ -36,7 +38,18 @@
 	terminate chan bool
 }
 
-const DEFAULT_INTERVAL = time.Duration(60 * time.Second)
+var (
+	pollInterval = time.Duration(5 * time.Minute)
+	maxInterval  = time.Duration(20 * time.Minute)
+)
+
+func init() {
+	if intervalEnv := os.Getenv("ACCOUNT_POLLD_POLL_INTERVAL_MINUTES"); intervalEnv != "" {
+		if interval, err := strconv.ParseInt(intervalEnv, 0, 0); err == nil {
+			pollInterval = time.Duration(interval) * time.Minute
+		}
+	}
+}
 
 func NewAccountManager(authData accounts.AuthData, postWatch chan *PostWatch, plugin plugins.Plugin) *AccountManager {
 	return &AccountManager{
@@ -44,7 +57,7 @@
 		authData:  authData,
 		authMutex: &sync.Mutex{},
 		postWatch: postWatch,
-		interval:  DEFAULT_INTERVAL,
+		interval:  pollInterval,
 		terminate: make(chan bool),
 	}
 }
@@ -87,10 +100,12 @@
 	if n, err := a.plugin.Poll(&a.authData); err != nil {
 		log.Print("Error while polling ", a.authData.AccountId, ": ", err)
 		// penalizing the next poll
-		a.interval += DEFAULT_INTERVAL
+		if a.interval.Minutes() < maxInterval.Minutes() {
+			a.interval += pollInterval
+		}
 	} else if len(n) > 0 {
 		// on success we reset the timeout to the default interval
-		a.interval = DEFAULT_INTERVAL
+		a.interval = pollInterval
 		a.postWatch <- &PostWatch{messages: n, appId: a.plugin.ApplicationId()}
 	}
 }