From cad441c4133b4e69d74f622ea246769fc3de675d Mon Sep 17 00:00:00 2001
From: Stuart Colville <scolville@mozilla.com>
Date: Fri, 10 Jun 2016 11:15:51 +0100
Subject: [PATCH] Add more logging

---
 src/disco/addonManager.js     | 10 +++++++++-
 src/disco/components/Addon.js |  6 +++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/disco/addonManager.js b/src/disco/addonManager.js
index ced323a5c4a..bd677e6fe88 100644
--- a/src/disco/addonManager.js
+++ b/src/disco/addonManager.js
@@ -25,21 +25,27 @@ export function install(url, eventCallback,
     .then((installObj) => {
       const callback = (e) => eventCallback(installObj, e);
       for (const event of installEventList) {
+        log.info(`[install] Adding listener for ${event}`);
         installObj.addEventListener(event, callback);
       }
+      log.info('Events to handle the installation initialized.');
       return installObj.install();
     });
 }
 
 export function uninstall(guid, {_mozAddonManager = window.navigator.mozAddonManager} = {}) {
   return getAddon(guid, {_mozAddonManager})
-    .then((addon) => addon.uninstall())
+    .then((addon) => {
+      log.info(`Requesting uninstall of ${guid}`);
+      return addon.uninstall();
+    })
     .then((result) => {
       // Until bug 1268075 this will resolve with a boolean
       // for success and failure.
       if (result === false) {
         throw new Error('Uninstall failed');
       }
+      log.info('Uninstall complete');
       return;
     });
 }
@@ -56,8 +62,10 @@ export function addChangeListeners(callback, mozAddonManager) {
 
   if (mozAddonManager && mozAddonManager.addEventListener) {
     for (const event of globalEvents) {
+      log.info(`adding event listener for "${event}"`);
       mozAddonManager.addEventListener(event, handleChangeEvent);
     }
+    log.info('Global change event listeners have been initialized');
   } else {
     log.info('mozAddonManager.addEventListener not available');
   }
diff --git a/src/disco/components/Addon.js b/src/disco/components/Addon.js
index 656208c1de1..51516da71d1 100644
--- a/src/disco/components/Addon.js
+++ b/src/disco/components/Addon.js
@@ -10,6 +10,7 @@ import config from 'config';
 import themeAction, { getThemeData } from 'disco/themePreview';
 import tracking from 'core/tracking';
 import * as addonManager from 'disco/addonManager';
+import log from 'core/logger';
 
 import InstallButton from 'disco/components/InstallButton';
 import {
@@ -258,7 +259,10 @@ export function mapDispatchToProps(dispatch, { _tracking = tracking,
             const status = addon.isActive && addon.isEnabled ? ENABLED : DISABLED;
             dispatch({type: INSTALL_STATE, payload: {...payload, status}});
           },
-          () => dispatch({type: INSTALL_STATE, payload: {...payload, status: UNINSTALLED}}));
+          () => {
+            log.info('Add-on not found so setting status to UNINSTALLED');
+            dispatch({type: INSTALL_STATE, payload: {...payload, status: UNINSTALLED}});
+          });
     },
 
     install({ guid, installURL, name }) {