Skip to content

Add more logging #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2016
Merged

Add more logging #582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/disco/addonManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
});
}
Expand All @@ -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');
}
Expand Down
6 changes: 5 additions & 1 deletion src/disco/components/Addon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 }) {
Expand Down