Merge lp:~chipaca/ubuntu-push/fix-1380662-for-rtm into lp:ubuntu-push/krillin-rtm

[John Lenton]

Cherrypick r342 from automatic/ to fix the click hook wrt legacy apps.

Cherrypick r342 from automatic/ to fix the click hook wrt legacy apps.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

=== modified file 'client/session/session.go'
--- client/session/session.go	2014-10-23 19:30:24 +0000
+++ client/session/session.go	2015-01-16 17:53:22 +0000
@@ -430,7 +430,7 @@
 		return err
 	}
 	sess.clearShouldDelay()
-	sess.Log.Debugf("broadcast chan:%v app:%v topLevel:%d payloads:%s",
+	sess.Log.Infof("broadcast chan:%v app:%v topLevel:%d payloads:%s",
 		bcast.ChanId, bcast.AppId, bcast.TopLevel, bcast.Payloads)
 	if bcast.ChanId == protocol.SystemChannelId {
 		// the system channel id, the only one we care about for now
@@ -438,7 +438,7 @@
 		sess.BroadcastCh <- sess.decodeBroadcast(bcast)
 		sess.Log.Debugf("sent bcast over")
 	} else {
-		sess.Log.Debugf("what is this weird channel, %#v?", bcast.ChanId)
+		sess.Log.Errorf("what is this weird channel, %#v?", bcast.ChanId)
 	}
 	return nil
 }
@@ -468,7 +468,7 @@
 		if to == nil {
 			continue
 		}
-		sess.Log.Debugf("unicast app:%v msg:%s payload:%s",
+		sess.Log.Infof("unicast app:%v msg:%s payload:%s",
 			notif.AppId, notif.MsgId, notif.Payload)
 		sess.Log.Debugf("sending ucast over")
 		sess.NotificationsCh <- AddressedNotification{to, notif}

=== modified file 'debian/config.json'
--- debian/config.json	2014-08-21 10:47:12 +0000
+++ debian/config.json	2015-01-16 17:53:22 +0000
@@ -12,7 +12,7 @@
     "recheck_timeout": "10m",
     "connectivity_check_url": "http://start.ubuntu.com/connectivity-check.html",
     "connectivity_check_md5": "4589f42e1546aa47ca181e5d949d310b",
-    "log_level": "debug",
+    "log_level": "info",
     "fallback_vibration": {"pattern": [100, 100], "repeat": 2},
     "fallback_sound": "sounds/ubuntu/notifications/Slick.ogg",
     "poll_interval": "5m",

=== modified file 'launch_helper/kindpool.go'
--- launch_helper/kindpool.go	2014-08-20 12:42:51 +0000
+++ launch_helper/kindpool.go	2015-01-16 17:53:22 +0000
@@ -294,12 +294,13 @@
 	}
 	payload, err := ioutil.ReadFile(args.FileOut)
 	if err != nil {
-		pool.log.Errorf("unable to read output from helper: %v", err)
+		pool.log.Errorf("unable to read output from %v helper: %v", args.AppId, err)
 	} else {
+		pool.log.Infof("%v helper output: %#v", args.AppId, payload)
 		res := &HelperResult{Input: args.Input}
 		err = json.Unmarshal(payload, &res.HelperOutput)
 		if err != nil {
-			pool.log.Debugf("failed to parse HelperOutput from helper output: %v", err)
+			pool.log.Errorf("failed to parse HelperOutput from %v helper output: %v", args.AppId, err)
 		} else {
 			pool.chOut <- res
 		}

=== modified file 'launch_helper/legacy/legacy.go'
--- launch_helper/legacy/legacy.go	2014-08-21 18:03:49 +0000
+++ launch_helper/legacy/legacy.go	2015-01-16 17:53:22 +0000
@@ -55,7 +55,7 @@
 	err error
 }
 
-func (lhl *legacyHelperLauncher) Launch(_, progname, f1, f2 string) (string, error) {
+func (lhl *legacyHelperLauncher) Launch(appId, progname, f1, f2 string) (string, error) {
 	comm := make(chan msg)
 
 	go func() {
@@ -78,9 +78,8 @@
 		p_err := cmd.Wait()
 		if p_err != nil {
 			// Helper failed or got killed, log output/errors
-			lhl.log.Errorf("Legacy helper failed: %v", p_err)
-			lhl.log.Errorf("Legacy helper failed. Stdout: %s", stdout)
-			lhl.log.Errorf("Legacy helper failed. Stderr: %s", stderr)
+			lhl.log.Errorf("Legacy helper failed: appId: %v, helper: %v, pid: %v, error: %v, stdout: %#v, stderr: %#v.",
+				appId, progname, id, p_err, stdout.String(), stderr.String())
 		}
 		lhl.done(id)
 	}()

=== modified file 'scripts/click-hook'
--- scripts/click-hook	2014-08-04 15:37:01 +0000
+++ scripts/click-hook	2015-01-16 17:53:22 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+# -*- python -*-
 """Collect helpers hook data into a single json file"""
 
 import argparse
@@ -24,25 +25,30 @@
 
 
 def cleanup_settings():
+    settings = Gio.Settings.new('com.ubuntu.notifications.hub')
+    blacklist = settings.get_value('blacklist').unpack()
+    if not blacklist:
+        return
+
     clickdb = Click.DB.new()
     clickdb.read()
 
-    pkgnames = []
+    pkgnames = set()
     for package in clickdb.get_packages(False):
-        pkgnames.append(package.get_property('package'))
+        pkgnames.add(package.get_property('package'))
 
-    settings = Gio.Settings.new('com.ubuntu.notifications.hub')
     goodapps = GLib.VariantBuilder.new(GLib.VariantType.new("a(ss)"))
 
-    for appname in settings.get_value('blacklist').unpack():
-        if appname[0] in pkgnames:
+    dirty = False
+
+    for appname in blacklist:
+        if appname[0] not in pkgnames and Gio.DesktopAppInfo.new(appname[1] + ".desktop") is None:
+            dirty = True
+        else:
             goodapps.add_value(tup2variant(appname))
-        elif (appname[0] == appname[1]):
-            appinfo = Gio.DesktopAppInfo.new(appname[0] + ".desktop")
-            if not appinfo is None:
-                goodapps.add_value(tup2variant(appname))
 
-    settings.set_value('blacklist', goodapps.end())
+    if dirty:
+        settings.set_value('blacklist', goodapps.end())
 
 
 def collect_helpers(helpers_data_path, helpers_data_path_tmp, hooks_path):