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

Fix log formatting #1129

Merged
merged 4 commits into from
Feb 9, 2024
Merged

Fix log formatting #1129

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3e4705f
Fix logging
avimanyum Feb 9, 2024
9e15516
Merge pull request #1 from avimanyum/W-14925234
avimanyum Feb 9, 2024
8fb7a2f
Fix logging
avimanyum Feb 9, 2024
c2e5362
Merge pull request #2 from avimanyum/W-14925234
avimanyum Feb 9, 2024
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
6 changes: 3 additions & 3 deletions ...e-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/PullRequests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void prepareToCreate(final Namespace ns,
//If the repository has been onboarded to renovate enterprise, skip sending the DFIU PR
if(ns.getBoolean(Constants.CHECK_FOR_RENOVATE)
&& (isRenovateEnabled(Constants.RENOVATE_CONFIG_FILEPATHS, forkWithContentPaths.get()))) {
log.info("Found a renovate configuration file in the repo %s. Skip sending DFIU PRs to this repository.", forkWithContentPaths.get().getParent().getFullName());
log.info("Found a renovate configuration file in the repo {}. Skip sending DFIU PRs to this repository.", forkWithContentPaths.get().getParent().getFullName());
} else {
dockerfileGitHubUtil.changeDockerfiles(ns,
pathToDockerfilesInParentRepo,
Expand Down Expand Up @@ -64,9 +64,9 @@ protected boolean isRenovateEnabled(List<String> filePaths, GitHubContentToProce
//If the file has the key 'enabled' set to false, it indicates that while the repo has been onboarded to renovate, it has been disabled for some reason
return readJsonFromContent(fork.getParent().getFileContent(filePath)).optBoolean("enabled", true);
} catch (FileNotFoundException e) {
log.debug("The file with name %s not found in the repository. Exception: %s", filePath, e.getMessage());
log.debug("The file with name {} not found in the repository. Exception: {}", filePath, e.getMessage());
} catch (IOException e) {
log.debug("Exception while trying to close a resource. Exception: %s", e.getMessage());
log.debug("Exception while trying to close a resource. Exception: {}", e.getMessage());
}
}
return false;
Expand Down
Loading