1
=== modified file 'cmd/account-polld/account_manager.go'
2
--- cmd/account-polld/account_manager.go	2014-07-24 21:16:18 +0000
3
+++ cmd/account-polld/account_manager.go	2014-07-24 21:16:18 +0000
4
@@ -19,6 +19,8 @@
5
19
19
6
20
import (
20
import (
7
21
	"log"
21
	"log"
8
22
	"os"
9
23
	"strconv"
10
22
	"sync"
24
	"sync"
11
23
	"time"
25
	"time"
12
24
26
13
@@ -36,7 +38,18 @@
14
36
	terminate chan bool
38
	terminate chan bool
15
37
}
39
}
16
38
40
18
39
const DEFAULT_INTERVAL = time.Duration(60 * time.Second)
41
var (
19
42
	pollInterval = time.Duration(5 * time.Minute)
20
43
	maxInterval  = time.Duration(20 * time.Minute)
21
44
)
22
45
23
46
func init() {
24
47
	if intervalEnv := os.Getenv("ACCOUNT_POLLD_POLL_INTERVAL_MINUTES"); intervalEnv != "" {
25
48
		if interval, err := strconv.ParseInt(intervalEnv, 0, 0); err == nil {
26
49
			pollInterval = time.Duration(interval) * time.Minute
27
50
		}
28
51
	}
29
52
}
30
40
53
31
41
func NewAccountManager(authData accounts.AuthData, postWatch chan *PostWatch, plugin plugins.Plugin) *AccountManager {
54
func NewAccountManager(authData accounts.AuthData, postWatch chan *PostWatch, plugin plugins.Plugin) *AccountManager {
32
42
	return &AccountManager{
55
	return &AccountManager{
33
@@ -44,7 +57,7 @@
34
44
		authData:  authData,
57
		authData:  authData,
35
45
		authMutex: &sync.Mutex{},
58
		authMutex: &sync.Mutex{},
36
46
		postWatch: postWatch,
59
		postWatch: postWatch,
38
47
		interval:  DEFAULT_INTERVAL,
60
		interval:  pollInterval,
39
48
		terminate: make(chan bool),
61
		terminate: make(chan bool),
40
49
	}
62
	}
41
50
}
63
}
42
@@ -87,10 +100,12 @@
43
87
	if n, err := a.plugin.Poll(&a.authData); err != nil {
100
	if n, err := a.plugin.Poll(&a.authData); err != nil {
44
88
		log.Print("Error while polling ", a.authData.AccountId, ": ", err)
101
		log.Print("Error while polling ", a.authData.AccountId, ": ", err)
45
89
		// penalizing the next poll
102
		// penalizing the next poll
47
90
		a.interval += DEFAULT_INTERVAL
103
		if a.interval.Minutes() < maxInterval.Minutes() {
48
104
			a.interval += pollInterval
49
105
		}
50
91
	} else if len(n) > 0 {
106
	} else if len(n) > 0 {
51
92
		// on success we reset the timeout to the default interval
107
		// on success we reset the timeout to the default interval
53
93
		a.interval = DEFAULT_INTERVAL
108
		a.interval = pollInterval
54
94
		a.postWatch <- &PostWatch{messages: n, appId: a.plugin.ApplicationId()}
109
		a.postWatch <- &PostWatch{messages: n, appId: a.plugin.ApplicationId()}
55
95
	}
110
	}
56
96
}
111
}
Status:	Merged
Approved by:	Roberto Alsina on 2014-07-25
Approved revision:	19
Merged at revision:	18
Proposed branch:	lp:~sergiusens/account-polld/interval
Merge into:	lp:~phablet-team/account-polld/trunk
Prerequisite:	lp:~sergiusens/account-polld/click_poll_check
Diff against target:	56 lines (+19/-4) 1 file modified cmd/account-polld/account_manager.go (+19/-4)
To merge this branch:	bzr merge lp:~sergiusens/account-polld/interval
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Roberto Alsina (community)		2014-07-24	Approve on 2014-07-25
PS Jenkins bot	continuous-integration		Approve on 2014-07-24
Review via email: mp+228197@code.launchpad.net