Skip to content

Commit

Permalink
Merge pull request #1271 from mountaindude/1265
Browse files Browse the repository at this point in the history
fix: Show correct config file path in log during startup
  • Loading branch information
mountaindude authored Oct 15, 2024
2 parents 664cdaf + 580d00d commit 659a2f5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/lib/assert/assert_config_file.js
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ export async function configFileStructureAssert() {
// Add formats to ajv instance
ajvFormats.default(ajv);

// Load the YAML schema file, identified by globals.configFile, from file
// Load the YAML schema file, identified by globals.configFileExpanded, from file
const fileContent = await fs.readFile(globals.configFileExpanded, 'utf8');

// Parse the YAML file
Expand Down Expand Up @@ -696,7 +696,7 @@ export async function configFileStructureAssert() {
// ------------------------------
// Verify values of specific config entries

globals.logger.info(`VERIFY CONFIG FILE: Your config file at ${globals.configFile} is valid, good work!`);
globals.logger.info(`VERIFY CONFIG FILE: Your config file at ${globals.configFileExpanded} is valid, good work!`);

return true;
} catch (err) {
Expand Down
5 changes: 1 addition & 4 deletions src/lib/qscloud/email_notification_qscloud.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,6 @@ export async function sendQlikSenseCloudAppReloadFailureNotificationEmail(reload
globals.logger.info(
`EMAIL ALERT - QS CLOUD APP RELOAD FAILED: Rate limiting check passed for failed task notification. App name: "${reloadParams.appName}"`,
);
globals.logger.verbose(
`EMAIL ALERT - QS CLOUD APP RELOAD FAILED: Rate limiting details "${JSON.stringify(rateLimiterRes, null, 2)}"`,
);

// Logic for determining if alert email should be sent or not
// 1. If config setting Butler.qlikSenseCloud.event.mqtt.tenant.alert.emailNotification.reloadAppFailure.enabled is false, do not send email
Expand Down Expand Up @@ -120,7 +117,7 @@ export async function sendQlikSenseCloudAppReloadFailureNotificationEmail(reload
// Get recipients based on app tags (or for all failed reloads)
if (emailConfig.emailAlertByTagEnable === false) {
// Email alerts are enabled for all failed app reloads, not just those with a specific tag set
if (emailConfig?.globalSendList?.length < 0) {
if (emailConfig?.globalSendList?.length > 0) {
// Add global send list from YAML config file to main send list
globalSendList.push(...emailConfig.globalSendList);
}
Expand Down

0 comments on commit 659a2f5

Please sign in to comment.