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

Revert "[Temporary Fix] Remove debug logs" #283

Merged
merged 1 commit into from
Nov 20, 2024
Merged

Revert "[Temporary Fix] Remove debug logs" #283

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
60 changes: 25 additions & 35 deletions .../main/java/org/wso2/carbon/identity/event/handler/notification/util/NotificationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,22 +238,16 @@ public static Map<String, String> getPlaceholderValues(EmailTemplate emailTempla
.equals(e.getErrorCode())) {
brandingPreferences = null;
} else {
// if (log.isDebugEnabled()) {
// String message =
// "Error occurred while retrieving branding preferences for organization " +
// placeHolderData.get(TENANT_DOMAIN);
// log.debug(message, e);
// }
// Ignore
if (log.isDebugEnabled()) {
String message = "Error occurred while retrieving branding preferences for organization " + placeHolderData.get(TENANT_DOMAIN);
log.debug(message, e);
}
}
} catch (Exception e) {
// if (log.isDebugEnabled()) {
// String message =
// "Error occurred while retrieving branding preferences for organization " + placeHolderData
// .get(TENANT_DOMAIN);
// log.debug(message, e);
// }
// Ignore
if (log.isDebugEnabled()) {
String message = "Error occurred while retrieving branding preferences for organization " + placeHolderData.get(TENANT_DOMAIN);
log.debug(message, e);
}
}
}

Expand Down Expand Up @@ -385,27 +379,25 @@ public static String getCopyrightPlaceholderValueFromCustomTexts(String tenantDo
} catch (BrandingPreferenceMgtException e) {
if (BrandingPreferenceMgtConstants.ErrorMessages.ERROR_CODE_CUSTOM_TEXT_PREFERENCE_NOT_EXISTS.getCode()
.equals(e.getErrorCode())) {
// if (log.isDebugEnabled()) {
// String message = "Custom text preferences are not configured for the organization: "
// + tenantDomain + " with locale: " + locale;
// log.debug(message, e);
// }
if (log.isDebugEnabled()) {
String message = "Custom text preferences are not configured for the organization: "
+ tenantDomain + " with locale: " + locale;
log.debug(message, e);
}
customTextPreference = null;
} else {
// if (log.isDebugEnabled()) {
// String message = "Error occurred while retrieving custom text preferences for organization "
// + tenantDomain;
// log.debug(message, e);
// }
// Ignore
if (log.isDebugEnabled()) {
String message = "Error occurred while retrieving custom text preferences for organization "
+ tenantDomain;
log.debug(message, e);
}
}
} catch (Exception e) {
// if (log.isDebugEnabled()) {
// String message = "Error occurred while retrieving custom text preferences for organization "
// + tenantDomain;
// log.debug(message, e);
// }
// Ignore
if (log.isDebugEnabled()) {
String message = "Error occurred while retrieving custom text preferences for organization "
+ tenantDomain;
log.debug(message, e);
}
}

if (customTextPreference != null) {
Expand Down Expand Up @@ -722,12 +714,10 @@ public static Notification buildNotification(Event event, Map<String, String> pl
.getApplicationBasicInfoByName(applicationName, applicationDomain)
.getApplicationResourceId();
} catch (IdentityApplicationManagementException | NullPointerException e) {
// log.debug("Fallback to organization preference. Error fetching application id for application name: " + applicationName, e);
// ignore
log.debug("Fallback to organization preference. Error fetching application id for application name: " + applicationName, e);
}
} else {
// log.debug("Fallback to organization preference. Cannot get application id or application name from the event");
// ignore
log.debug("Fallback to organization preference. Cannot get application id or application name from the event");
}

emailTemplateExists = NotificationHandlerDataHolder.getInstance().getEmailTemplateManager()
Expand Down
Loading