1
=== modified file 'cmd/account-polld/main.go'
2
--- cmd/account-polld/main.go	2016-02-28 22:41:25 +0000
3
+++ cmd/account-polld/main.go	2016-02-28 22:41:25 +0000
4
@@ -93,60 +93,20 @@
5
93
}
93
}
6
94
94
7
95
func monitorAccounts(postWatch chan *PostWatch, pollBus *pollbus.PollBus) {
95
func monitorAccounts(postWatch chan *PostWatch, pollBus *pollbus.PollBus) {
10
96
	// Note: the accounts monitored are all linked to webapps right now
96
	// register account watchers
11
97
	watcher := accounts.NewWatcher(SERVICETYPE_WEBAPPS)
97
	webappWatcher := accounts.NewWatcher(SERVICETYPE_WEBAPPS)
12
98
13
99
	// map: account id -> account manager
14
98
	mgr := make(map[uint]*AccountManager)
100
	mgr := make(map[uint]*AccountManager)
15
99
101
16
100
	var wg sync.WaitGroup
102
	var wg sync.WaitGroup
17
101
103
18
102
L:
19
103
	for {
104
	for {
20
104
		select {
105
		select {
66
105
		case data := <-watcher.C:
106
		// Handle account creation, new account data and account deletion
67
106
			if account, ok := mgr[data.AccountId]; ok {
107
		case data := <-webappWatcher.C:
68
107
				if data.Enabled {
108
			handleWatcherData(&wg, webappWatcher, postWatch, mgr, data, SERVICETYPE_WEBAPPS)
69
108
					log.Println("New account data for existing account with id", data.AccountId)
109
		// Respond to dbus poll requests
25
109
					account.penaltyCount = 0
26
110
					account.updateAuthData(data)
27
111
					wg.Add(1)
28
112
					go func() {
29
113
						defer wg.Done()
30
114
						// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
31
115
						// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
32
116
						account.Poll(false)
33
117
					}()
34
118
					// No wg.Wait() here as it would break GetAvatar() again.
35
119
					// Instead we have a wg.Wait() before the PollChan polling below.
36
120
				} else {
37
121
					account.Delete()
38
122
					delete(mgr, data.AccountId)
39
123
				}
40
124
			} else if data.Enabled {
41
125
				var plugin plugins.Plugin
42
126
				switch data.ServiceName {
43
127
				case SERVICENAME_GMAIL:
44
128
					log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
45
129
					plugin = gmail.New(data.AccountId)
46
130
				case SERVICENAME_TWITTER:
47
131
					// This is just stubbed until the plugin exists.
48
132
					log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
49
133
					plugin = twitter.New(data.AccountId)
50
134
				default:
51
135
					log.Println("Unhandled account with id", data.AccountId, "for", data.ServiceName)
52
136
					continue L
53
137
				}
54
138
				mgr[data.AccountId] = NewAccountManager(watcher, postWatch, plugin)
55
139
				mgr[data.AccountId].updateAuthData(data)
56
140
				wg.Add(1)
57
141
				go func() {
58
142
					defer wg.Done()
59
143
					// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
60
144
					// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
61
145
					mgr[data.AccountId].Poll(true)
62
146
				}()
63
147
				// No wg.Wait() here as it would break GetAvatar() again.
64
148
				// Instead we have a wg.Wait() before the PollChan polling below.
65
149
			}
70
150
		case <-pollBus.PollChan:
110
		case <-pollBus.PollChan:
71
151
			wg.Wait() // Finish all running Poll() calls before potentially polling the same accounts again
111
			wg.Wait() // Finish all running Poll() calls before potentially polling the same accounts again
72
152
			for _, v := range mgr {
112
			for _, v := range mgr {
73
@@ -166,6 +126,55 @@
74
166
	}
126
	}
75
167
}
127
}
76
168
128
77
129
func handleWatcherData(wg *sync.WaitGroup, watcher *accounts.Watcher, postWatch chan *PostWatch, mgr map[uint]*AccountManager, data accounts.AuthData, serviceType string) {
78
130
	if account, ok := mgr[data.AccountId]; ok {
79
131
		if data.Enabled {
80
132
			log.Println("New account data for existing account with id", data.AccountId)
81
133
			account.penaltyCount = 0
82
134
			account.updateAuthData(data)
83
135
			wg.Add(1)
84
136
			go func() {
85
137
				defer wg.Done()
86
138
				// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
87
139
				// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
88
140
				account.Poll(false)
89
141
			}()
90
142
			// No wg.Wait() here as it would break GetAvatar() again.
91
143
			// Instead we have a wg.Wait() before the PollChan polling below.
92
144
		} else {
93
145
			account.Delete()
94
146
			delete(mgr, data.AccountId)
95
147
		}
96
148
	} else if data.Enabled {
97
149
		var plugin plugins.Plugin = nil
98
150
		if serviceType == SERVICETYPE_WEBAPPS { // Allows other service types to be added here in the future
99
151
			switch data.ServiceName {
100
152
			case SERVICENAME_GMAIL:
101
153
				log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
102
154
				plugin = gmail.New(data.AccountId)
103
155
			case SERVICENAME_TWITTER:
104
156
				log.Println("Creating account with id", data.AccountId, "for", data.ServiceName)
105
157
				plugin = twitter.New(data.AccountId)
106
158
			default:
107
159
				log.Println("Unhandled account with id", data.AccountId, "for", data.ServiceName)
108
160
			}
109
161
		}
110
162
		if plugin != nil {
111
163
			mgr[data.AccountId] = NewAccountManager(watcher, postWatch, plugin)
112
164
			mgr[data.AccountId].updateAuthData(data)
113
165
			wg.Add(1)
114
166
			go func() {
115
167
				defer wg.Done()
116
168
				// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
117
169
				// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
118
170
				mgr[data.AccountId].Poll(true)
119
171
			}()
120
172
			// No wg.Wait() here as it would break GetAvatar() again.
121
173
			// Instead we have a wg.Wait() before the PollChan polling below.
122
174
		}
123
175
	}
124
176
}
125
177
126
169
func postOffice(bus *dbus.Connection, postWatch chan *PostWatch) {
178
func postOffice(bus *dbus.Connection, postWatch chan *PostWatch) {
127
170
	for post := range postWatch {
179
	for post := range postWatch {
128
171
		obj := bus.Object(POSTAL_SERVICE, pushObjectPath(post.appId))
180
		obj := bus.Object(POSTAL_SERVICE, pushObjectPath(post.appId))
Status:	Needs review
Proposed branch:	lp:~nikwen/account-polld/more-flexible-plugin-initialization
Merge into:	lp:~ubuntu-push-hackers/account-polld/trunk
Prerequisite:	lp:~nikwen/account-polld/more-flexible-account-authentication
Diff against target:	128 lines (+57/-48) 1 file modified cmd/account-polld/main.go (+57/-48)
To merge this branch:	bzr merge lp:~nikwen/account-polld/more-flexible-plugin-initialization
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Push Hackers		2016-02-28	Pending
Review via email: mp+287418@code.launchpad.net