Merge lp:~nikwen/account-polld/fix-qtcontacts-timeout-error into lp:~ubuntu-push-hackers/account-polld/trunk

[Niklas Wenzel]

Fix a timeout error in the qtcontacts module which occured when a notification was shown directly after creating an account (fixes LP: #1498214)

Fix a timeout error in the qtcontacts module which occured when a notification was shown directly after creating an account (fixes LP: #1498214)

This depends on https://code.launchpad.net/~nikwen/account-polld/fix-timeout-handler/+merge/273351

[Niklas Wenzel (nikwen)]

This does actually need review! It's no WIP anymore.

[Jonas G. Drange (jonas-drange)]

LGTM

review: Approve

=== modified file 'cmd/account-polld/account_manager.go'
--- cmd/account-polld/account_manager.go	2015-03-20 17:51:02 +0000
+++ cmd/account-polld/account_manager.go	2015-10-04 21:40:32 +0000
@@ -66,6 +66,8 @@
 	close(a.doneChan)
 }
 
+// Poll() always needs to be called asynchronously as otherwise qtcontacs' GetAvatar()
+// will raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
 func (a *AccountManager) Poll(bootstrap bool) {
 	if !a.authData.Enabled {
 		var ok bool

=== modified file 'cmd/account-polld/main.go'
--- cmd/account-polld/main.go	2015-10-04 21:40:32 +0000
+++ cmd/account-polld/main.go	2015-10-04 21:40:32 +0000
@@ -97,6 +97,8 @@
 	watcher := accounts.NewWatcher(SERVICETYPE_WEBAPPS)
 	mgr := make(map[uint]*AccountManager)
 
+	var wg sync.WaitGroup
+
 L:
 	for {
 		select {
@@ -106,7 +108,15 @@
 					log.Println("New account data for existing account with id", data.AccountId)
 					account.penaltyCount = 0
 					account.updateAuthData(data)
-					account.Poll(false)
+					wg.Add(1)
+					go func() {
+						defer wg.Done()
+						// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
+						// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
+						account.Poll(false)
+					}()
+					// No wg.Wait() here as it would break GetAvatar() again.
+					// Instead we have a wg.Wait() before the PollChan polling below.
 				} else {
 					account.Delete()
 					delete(mgr, data.AccountId)
@@ -131,10 +141,18 @@
 				}
 				mgr[data.AccountId] = NewAccountManager(watcher, postWatch, plugin)
 				mgr[data.AccountId].updateAuthData(data)
-				mgr[data.AccountId].Poll(true)
+				wg.Add(1)
+				go func() {
+					defer wg.Done()
+					// Poll() needs to be called asynchronously as otherwise qtcontacs' GetAvatar() will
+					// raise an error: "QSocketNotifier: Can only be used with threads started with QThread"
+					mgr[data.AccountId].Poll(true)
+				}()
+				// No wg.Wait() here as it would break GetAvatar() again.
+				// Instead we have a wg.Wait() before the PollChan polling below.
 			}
 		case <-pollBus.PollChan:
-			var wg sync.WaitGroup
+			wg.Wait() // Finish all running Poll() calls before potentially polling the same accounts again
 			for _, v := range mgr {
 				if v.authData.Error != plugins.ErrTokenExpired { // Do not poll if the new token
 					// hasn't been loaded yet