Skip to content

Always persist history #780

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
kwin merged 1 commit into from
Jan 31, 2025
Merged

Always persist history #780

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
4 changes: 1 addition & 3 deletions ...l-bundle/src/main/java/biz/netcentric/cq/tools/actool/impl/AcInstallationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,6 @@ public InstallationLog apply(String configurationRootPath, String[] restrictedTo
return applyMultipleConfigurations(restrictedToPaths, skipIfConfigUnchanged);
}
}

PersistableInstallationLogger installLog = new PersistableInstallationLogger();
Session session = null;
try {
Expand All @@ -214,13 +213,11 @@ public InstallationLog apply(String configurationRootPath, String[] restrictedTo
configFiles = configFilesRetriever.getConfigFileContentFromNode(configurationRootPath, session);
} catch (Exception e) {
installLog.addError("Could not retrieve configuration from path "+configurationRootPath+": "+e.getMessage(), e);
persistHistory(installLog);
return installLog;
}

// install config files
installConfigurationFiles(installLog, configFiles, restrictedToPaths, session, skipIfConfigUnchanged);

} catch (AuthorizableCreatorException e) {
// exception was added to history in installConfigurationFiles() before it was saved
LOG.warn("Exception during installation of authorizables (no rollback), e=" + e, e);
Expand All @@ -234,6 +231,7 @@ public InstallationLog apply(String configurationRootPath, String[] restrictedTo
LOG.error("Exception in AceServiceImpl: {}", e);
// exception was added to history in installConfigurationFiles() before it was saved
} finally {
persistHistory(installLog);
if (session != null) {
session.logout();
}
Expand Down
Loading