Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-12 16:35:45 +01:00
Code Issues Packages Projects Releases Activity

Error handling for plugin installation/uninstallaion

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-10-01 09:33:48 +02:00
parent 9261513555
commit aded308138
8 changed files with 40 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/main/java/sonia/scm/plugin/DefaultPluginManager.java
View File

@@ -288,7 +288,7 @@ public class DefaultPluginManager implements PluginManager {
pendingInstallQueue.forEach(PendingPluginInstallation::cancel);
pendingUninstallQueue.clear();
pendingInstallQueue.clear();
getInstalled().forEach(p -> p.setUninstallable(isUninstallable(p)));
updateMayUninstallFlag();
}
@Override

2
scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginInstallation.java
View File

@@ -30,7 +30,7 @@ class PendingPluginInstallation {
Files.delete(file);
plugin.cancelInstallation();
} catch (IOException ex) {
throw new PluginFailedToCancelInstallationException("failed to cancel installation of plugin " + name, ex);
throw new PluginFailedToCancelInstallationException("failed to cancel plugin installation ", name, ex);
}
}
}

2
scm-webapp/src/main/java/sonia/scm/plugin/PendingPluginUninstallation.java
View File

@@ -26,7 +26,7 @@ class PendingPluginUninstallation {
Files.delete(uninstallFile);
plugin.setMarkedForUninstall(false);
} catch (IOException ex) {
throw new PluginFailedToCancelInstallationException("failed to cancel uninstallation of plugin " + name, ex);
throw new PluginFailedToCancelInstallationException("failed to cancel uninstallation", name, ex);
}
}
}

15
scm-webapp/src/main/java/sonia/scm/plugin/PluginFailedToCancelInstallationException.java
View File

@@ -1,7 +1,16 @@
package sonia.scm.plugin;
public class PluginFailedToCancelInstallationException extends RuntimeException {
public PluginFailedToCancelInstallationException(String message, Throwable cause) {
super(message, cause);
import sonia.scm.ExceptionWithContext;
import static sonia.scm.ContextEntry.ContextBuilder.entity;
public class PluginFailedToCancelInstallationException extends ExceptionWithContext {
public PluginFailedToCancelInstallationException(String message, String name, Exception cause) {
super(entity("plugin", name).build(), message, cause);
}
@Override
public String getCode() {
return "65RdZ5atX1";
}
}