Skip to content
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

Remove kernel logging for non-debug case #434

Merged
merged 1 commit into from
Dec 11, 2023
Merged

Remove kernel logging for non-debug case #434

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
14 changes: 7 additions & 7 deletions src/main/java/io/openliberty/tools/common/plugins/util/InstallFeatureUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ public void installFeatures(boolean isAcceptLicense, List<String> featuresList)
}

if(featuresToInstall.isEmpty()) {
debug("featuresToInstall is empty");
debug("featuresToInstall is empty");
return;
}

Expand All @@ -724,20 +724,20 @@ public void installFeatures(boolean isAcceptLicense, List<String> featuresList)
disableCacheInURLClassLoader();
try {
String bundle = getOverrideBundleDescriptor(OPEN_LIBERTY_GROUP_ID, REPOSITORY_RESOLVER_ARTIFACT_ID);
mapBasedInstallKernel = createMapBasedInstallKernelInstance(bundle, installDirectory);
mapBasedInstallKernel = createMapBasedInstallKernelInstance(bundle, installDirectory);


Collection<?> resolvedFeatures = resolveFeatures(featuresToInstall, jsonRepos, acceptLicenseMapValue, pluginListedEsas);
if(resolvedFeatures == null || resolvedFeatures.isEmpty()) {
return;
}
Collection<?> resolvedFeatures = resolveFeatures(featuresToInstall, jsonRepos, acceptLicenseMapValue, pluginListedEsas);
if(resolvedFeatures == null || resolvedFeatures.isEmpty()) {
return;
}

Map<File, String> artifactsToExt = downloadEsas(resolvedFeatures, featureToExtMap);
Set<File> artifacts = artifactsToExt.keySet();


if (verifyOption != null && verifyOption != VerifyOption.skip) {
verifyFeatures(artifacts, installJarURL);
verifyFeatures(artifacts, installJarURL);
}


Expand Down
10 changes: 5 additions & 5 deletions src/main/java/io/openliberty/tools/common/plugins/util/ServerFeatureUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ private Map<String, Object> getInstallMapObject()
*/
protected Map<String, Object> createMapBasedInstallKernelInstance(String bundle, File installDirectory)
throws PrivilegedActionException, PluginExecutionException, MalformedURLException {
mapBasedInstallKernel = getInstallMapObject();
mapBasedInstallKernel = getInstallMapObject();

// Init
if (bundle != null) {
Expand All @@ -680,11 +680,11 @@ protected Map<String, Object> createMapBasedInstallKernelInstance(String bundle,
debug("install.kernel.init.error.message: " + mapBasedInstallKernel.get("install.kernel.init.error.message"));
File usrDir = new File(installDirectory, "usr");
mapBasedInstallKernel.put("target.user.directory", usrDir);
if (isDebugEnabled()) {
mapBasedInstallKernel.put("debug", Level.FINEST);
}else {
if (isDebugEnabled()) {
mapBasedInstallKernel.put("debug", Level.FINEST);
} /* else { removed due to "java.lang.ClassNotFoundException: com.ibm.websphere.ras.DataFormatHelper" reported in ci.gradle issue 867
mapBasedInstallKernel.put("debug", Level.INFO);
}
} */
return mapBasedInstallKernel;
}

Expand Down