public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

plugins: Move hook call and plugin update out of try block 

Exceptions thrown by these function calls are serious and should crash
Etherpad.
pull/4822/head
Richard Hansen 2021-02-18 02:36:50 -05:00 committed by John McLear
parent a8479e4a0e
commit 4253a2ea8f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/static/js/pluginfw/installer.js
View File

@ -36,12 +36,12 @@ exports.uninstall = async (pluginName, cb = null) => {
try { try {
await loadNpm(); await loadNpm();
await util.promisify(npm.commands.uninstall)([pluginName]); await util.promisify(npm.commands.uninstall)([pluginName]);
await hooks.aCallAll('pluginUninstall', {pluginName});
await plugins.update();
} catch (err) { } catch (err) {
cb(err || new Error(err)); cb(err || new Error(err));
throw err; throw err;
} }
await hooks.aCallAll('pluginUninstall', {pluginName});
await plugins.update();
cb(null); cb(null);
}; };
@ -50,12 +50,12 @@ exports.install = async (pluginName, cb = null) => {
try { try {
await loadNpm(); await loadNpm();
await util.promisify(npm.commands.install)([`${pluginName}@latest`]); await util.promisify(npm.commands.install)([`${pluginName}@latest`]);
await hooks.aCallAll('pluginInstall', {pluginName});
await plugins.update();
} catch (err) { } catch (err) {
cb(err || new Error(err)); cb(err || new Error(err));
throw err; throw err;
} }
await hooks.aCallAll('pluginInstall', {pluginName});
await plugins.update();
cb(null); cb(null);
}; };