diff --git a/.vscode/launch.json b/.vscode/launch.json index 7af0cd626a..599b932a3e 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -216,19 +216,6 @@ "debug:test" ], }, - { - "name": "Probe: Debug Tests", - "type": "node", - "restart": true, - "autoAttachChildProcesses": true, - "request": "launch", - "cwd": "${workspaceRoot}/Probe", - "runtimeExecutable": "npm", - "runtimeArgs": [ - "run-script", - "debug:test" - ], - }, { "name": "Accounts: Debug Local Files", "type": "node", diff --git a/Accounts/Serve.ts b/Accounts/Serve.ts index c16786f33c..45ad2aa823 100755 --- a/Accounts/Serve.ts +++ b/Accounts/Serve.ts @@ -30,7 +30,7 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/AdminDashboard/Serve.ts b/AdminDashboard/Serve.ts index 7eb68eaa1e..81eddbaff6 100755 --- a/AdminDashboard/Serve.ts +++ b/AdminDashboard/Serve.ts @@ -31,7 +31,7 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/App/FeatureSet/Notification/Services/CallService.ts b/App/FeatureSet/Notification/Services/CallService.ts index cba849a462..1f611ec923 100644 --- a/App/FeatureSet/Notification/Services/CallService.ts +++ b/App/FeatureSet/Notification/Services/CallService.ts @@ -41,7 +41,7 @@ export default class CallService { const callLog: CallLog = new CallLog(); try { - logger.info('Call Request received.'); + logger.debug('Call Request received.'); let callCost: number = 0; @@ -56,7 +56,7 @@ export default class CallService { } } - logger.info('Call Cost: ' + callCost); + logger.debug('Call Cost: ' + callCost); const twilioConfig: TwilioConfig | null = options.customTwilioConfig || (await getTwilioConfig()); @@ -101,7 +101,7 @@ export default class CallService { }, }); - logger.info('Project found.'); + logger.debug('Project found.'); if (!project) { callLog.status = CallStatus.Error; @@ -243,7 +243,7 @@ export default class CallService { } } - logger.info('Sending Call Request.'); + logger.debug('Sending Call Request.'); const twillioCall: CallInstance = await client.calls.create({ twiml: this.generateTwimlForCall(callRequest), @@ -251,16 +251,16 @@ export default class CallService { from: twilioConfig.phoneNumber.toString(), // From a valid Twilio number }); - logger.info('Call Request sent successfully.'); + logger.debug('Call Request sent successfully.'); callLog.status = CallStatus.Success; callLog.statusMessage = 'Call ID: ' + twillioCall.sid; - logger.info('Call ID: ' + twillioCall.sid); - logger.info(callLog.statusMessage); + logger.debug('Call ID: ' + twillioCall.sid); + logger.debug(callLog.statusMessage); if (shouldChargeForCall && project) { - logger.info('Updating Project Balance.'); + logger.debug('Updating Project Balance.'); callLog.callCostInUSDCents = callCost * 100; @@ -271,7 +271,7 @@ export default class CallService { ); } - logger.info('Call Cost: ' + callLog.callCostInUSDCents); + logger.debug('Call Cost: ' + callLog.callCostInUSDCents); project.smsOrCallCurrentBalanceInUSDCents = Math.floor( project.smsOrCallCurrentBalanceInUSDCents! - callCost * 100 @@ -289,8 +289,8 @@ export default class CallService { }, }); - logger.info("Project's current balance updated."); - logger.info( + logger.debug("Project's current balance updated."); + logger.debug( 'Current Balance: ' + project.smsOrCallCurrentBalanceInUSDCents ); @@ -306,19 +306,19 @@ export default class CallService { callError = e; } - logger.info('Saving Call Log if project id is provided.'); + logger.debug('Saving Call Log if project id is provided.'); if (options.projectId) { - logger.info('Saving Call Log.'); + logger.debug('Saving Call Log.'); await CallLogService.create({ data: callLog, props: { isRoot: true, }, }); - logger.info('Call Log saved.'); + logger.debug('Call Log saved.'); } else { - logger.info('Project Id is not provided. Call Log not saved.'); + logger.debug('Project Id is not provided. Call Log not saved.'); } if (options.userOnCallLogTimelineId) { diff --git a/App/FeatureSet/Notification/Services/SmsService.ts b/App/FeatureSet/Notification/Services/SmsService.ts index c2a6de50cc..f587e88774 100644 --- a/App/FeatureSet/Notification/Services/SmsService.ts +++ b/App/FeatureSet/Notification/Services/SmsService.ts @@ -251,8 +251,8 @@ export default class SmsService { smsLog.status = SmsStatus.Success; smsLog.statusMessage = 'Message ID: ' + twillioMessage.sid; - logger.info('SMS message sent successfully.'); - logger.info(smsLog.statusMessage); + logger.debug('SMS message sent successfully.'); + logger.debug(smsLog.statusMessage); if (shouldChargeForSMS && project) { smsLog.smsCostInUSDCents = smsCost * 100; diff --git a/App/FeatureSet/Notification/Utils/Handlebars.ts b/App/FeatureSet/Notification/Utils/Handlebars.ts index 03bdb8a7c7..a2d8476173 100644 --- a/App/FeatureSet/Notification/Utils/Handlebars.ts +++ b/App/FeatureSet/Notification/Utils/Handlebars.ts @@ -31,7 +31,7 @@ const loadPartials: PromiseVoidFunction = async (): Promise => { Handlebars.registerPartial(name, partialTemplate); - logger.info(`Loaded partial ${name}`); + logger.debug(`Loaded partial ${name}`); }); }; diff --git a/App/FeatureSet/Workers/Index.ts b/App/FeatureSet/Workers/Index.ts index 8d71140123..fd6e32fe43 100644 --- a/App/FeatureSet/Workers/Index.ts +++ b/App/FeatureSet/Workers/Index.ts @@ -100,7 +100,7 @@ const WorkersFeatureSet: FeatureSet = { async (job: QueueJob) => { const name: string = job.name; - logger.info('Running Job: ' + name); + logger.debug('Running Job: ' + name); const funcToRun: PromiseVoidFunction = JobDictionary.getJobFunction(name); diff --git a/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts b/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts index e02d8fb8a5..cdc897145b 100644 --- a/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts +++ b/App/FeatureSet/Workers/Jobs/HardDelete/HardDeleteItemsInDatabase.ts @@ -16,7 +16,7 @@ RunCron( { schedule: IsDevelopment ? EVERY_MINUTE : EVERY_DAY, runOnStartup: false }, async () => { if (!IsBillingEnabled) { - logger.info( + logger.debug( 'HardDelete:HardDeleteItemsInDatabase: Billing is not enabled. Skipping hard delete.' ); return; diff --git a/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts b/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts index 952791e72c..24a026f7b6 100644 --- a/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts +++ b/App/FeatureSet/Workers/Jobs/MeteredPlan/ReportTelemetryMeteredPlan.ts @@ -24,7 +24,7 @@ RunCron( }, async () => { if (!IsBillingEnabled) { - logger.info( + logger.debug( 'MeteredPlan:ReportTelemetryMeteredPlan Billing is not enabled. Skipping job.' ); return; diff --git a/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts b/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts index 0d759197af..b9754f4366 100644 --- a/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts +++ b/App/FeatureSet/Workers/Jobs/StatusPageCerts/StatusPageCerts.ts @@ -11,9 +11,9 @@ RunCron( runOnStartup: true, }, async () => { - logger.info('Renewing Certs...'); + logger.debug('Renewing Certs...'); await StatusPageDomainService.renewCertsWhichAreExpiringSoon(); - logger.info('Renew Completed...'); + logger.debug('Renew Completed...'); } ); diff --git a/App/FeatureSet/Workers/Utils/Cron.ts b/App/FeatureSet/Workers/Utils/Cron.ts index 6e2ba3914a..0ab8d9776f 100644 --- a/App/FeatureSet/Workers/Utils/Cron.ts +++ b/App/FeatureSet/Workers/Utils/Cron.ts @@ -22,7 +22,7 @@ const RunCron: RunCronFunction = ( ): void => { JobDictionary.setJobFunction(jobName, runFunction); - logger.info('Adding job to the queue: ' + jobName); + logger.debug('Adding job to the queue: ' + jobName); Queue.addJob( QueueName.Worker, diff --git a/App/FeatureSet/Workers/Utils/DataMigration.ts b/App/FeatureSet/Workers/Utils/DataMigration.ts index 0cecae36c9..2e39873d9a 100644 --- a/App/FeatureSet/Workers/Utils/DataMigration.ts +++ b/App/FeatureSet/Workers/Utils/DataMigration.ts @@ -21,15 +21,15 @@ const RunDatabaseMigrations: PromiseVoidFunction = async (): Promise => { }); if (existingMigration) { - logger.info('Skipping Database Migration:' + migration.name); + logger.debug('Skipping Database Migration:' + migration.name); continue; } - logger.info('Running Database Migration:' + migration.name); + logger.debug('Running Database Migration:' + migration.name); await migration.migrate(); - logger.info('Database Migration Complete:' + migration.name); + logger.debug('Database Migration Complete:' + migration.name); // add it to the database. const dataMigration: DataMigration = new DataMigration(); @@ -46,7 +46,7 @@ const RunDatabaseMigrations: PromiseVoidFunction = async (): Promise => { } catch (err) { logger.error('Database Migration Failed:' + migration.name); logger.error(err); - logger.info('Rolling back Database Migration:' + migration.name); + logger.debug('Rolling back Database Migration:' + migration.name); try { await migration.rollback(); diff --git a/App/Index.ts b/App/Index.ts index 008d517bfc..75ad978375 100755 --- a/App/Index.ts +++ b/App/Index.ts @@ -78,6 +78,6 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/CommonServer/API/StatusAPI.ts b/CommonServer/API/StatusAPI.ts index 163d2a6e0f..3061099cd9 100644 --- a/CommonServer/API/StatusAPI.ts +++ b/CommonServer/API/StatusAPI.ts @@ -37,7 +37,7 @@ export default class StatusAPI { '/status/ready', async (req: ExpressRequest, res: ExpressResponse) => { try { - logger.info('Ready check'); + logger.debug('Ready check'); await options.readyCheck(); Response.sendJsonObjectResponse(req, res, { status: 'ok', @@ -59,7 +59,7 @@ export default class StatusAPI { '/status/live', async (req: ExpressRequest, res: ExpressResponse) => { try { - logger.info('Live check'); + logger.debug('Live check'); await options.readyCheck(); Response.sendJsonObjectResponse(req, res, { status: 'ok', diff --git a/CommonServer/API/StatusPageAPI.ts b/CommonServer/API/StatusPageAPI.ts index a2751ad064..afda51b733 100644 --- a/CommonServer/API/StatusPageAPI.ts +++ b/CommonServer/API/StatusPageAPI.ts @@ -96,7 +96,7 @@ export default class StatusPageAPI extends BaseAPI< const token: string = req.params['token'] as string; - logger.info( + logger.debug( `CNAME Verification: Host:${host} - Token:${token}` ); diff --git a/CommonServer/API/StatusPageDomainAPI.ts b/CommonServer/API/StatusPageDomainAPI.ts index 81598d0430..8c6b18d3a4 100644 --- a/CommonServer/API/StatusPageDomainAPI.ts +++ b/CommonServer/API/StatusPageDomainAPI.ts @@ -240,12 +240,12 @@ export default class StatusPageDomainAPI extends BaseAPI< ); } - logger.info('Ordering SSL'); + logger.debug('Ordering SSL'); // provision SSL await StatusPageDomainService.orderCert(domain); - logger.info( + logger.debug( 'SSL Provisioned for domain - ' + domain.fullDomain ); diff --git a/CommonServer/Infrastructure/ClickhouseDatabase.ts b/CommonServer/Infrastructure/ClickhouseDatabase.ts index c532b13a07..3ee0239249 100644 --- a/CommonServer/Infrastructure/ClickhouseDatabase.ts +++ b/CommonServer/Infrastructure/ClickhouseDatabase.ts @@ -63,14 +63,14 @@ export default class ClickhouseDatabase { ); } - logger.info( + logger.debug( `Clickhouse Database Connected: ${dataSourceOptions.host?.toString()}` ); return clickhouseClient; } catch (err) { if (retry < 3) { - logger.info( + logger.debug( 'Cannot connect to Clickhouse. Retrying again in 5 seconds' ); // sleep for 5 seconds. diff --git a/CommonServer/Infrastructure/PostgresDatabase.ts b/CommonServer/Infrastructure/PostgresDatabase.ts index 3216637b28..95c451f132 100644 --- a/CommonServer/Infrastructure/PostgresDatabase.ts +++ b/CommonServer/Infrastructure/PostgresDatabase.ts @@ -38,12 +38,12 @@ export default class Database { ); const dataSource: DataSource = await PostgresDataSource.initialize(); - logger.info('Postgres Database Connected'); + logger.debug('Postgres Database Connected'); this.dataSource = dataSource; return dataSource; } catch (err) { if (retry < 3) { - logger.info( + logger.debug( 'Cannot connect to Postgres. Retrying again in 5 seconds' ); // sleep for 5 seconds. diff --git a/CommonServer/Infrastructure/Redis.ts b/CommonServer/Infrastructure/Redis.ts index 959234cccf..042b41b9c9 100644 --- a/CommonServer/Infrastructure/Redis.ts +++ b/CommonServer/Infrastructure/Redis.ts @@ -74,7 +74,7 @@ export default abstract class Redis { // Listen to the 'connect' event to Redis this.client.on('connect', (err: Error) => { if (!err) { - logger.info('Connected to Redis Session Store!'); + logger.debug('Connected to Redis Session Store!'); } }); @@ -89,7 +89,7 @@ export default abstract class Redis { await client.connect(); } catch (err) { if (retry < 3) { - logger.info( + logger.debug( 'Cannot connect to Redis. Retrying again in 5 seconds' ); // sleep for 5 seconds. @@ -105,7 +105,7 @@ export default abstract class Redis { await connectToDatabase(this.client); - logger.info( + logger.debug( `Redis connected on ${RedisHostname}:${RedisPort.toNumber()}` ); return this.client; diff --git a/CommonServer/Services/AnalyticsDatabaseService.ts b/CommonServer/Services/AnalyticsDatabaseService.ts index 6254a9cbcc..ff98cd2206 100644 --- a/CommonServer/Services/AnalyticsDatabaseService.ts +++ b/CommonServer/Services/AnalyticsDatabaseService.ts @@ -358,8 +358,8 @@ export default class AnalyticsDatabaseService< }} `); } - logger.info(`${this.model.tableName} Count Statement`); - logger.info(statement); + logger.debug(`${this.model.tableName} Count Statement`); + logger.debug(statement); return statement; } @@ -423,8 +423,8 @@ export default class AnalyticsDatabaseService< /* eslint-enable prettier/prettier */ - logger.info(`${this.model.tableName} Find Statement`); - logger.info(statement); + logger.debug(`${this.model.tableName} Find Statement`); + logger.debug(statement); return { statement, columns: select.columns }; } @@ -445,8 +445,8 @@ export default class AnalyticsDatabaseService< DELETE WHERE TRUE `.append(whereStatement); /* eslint-enable prettier/prettier */ - logger.info(`${this.model.tableName} Delete Statement`); - logger.info(statement); + logger.debug(`${this.model.tableName} Delete Statement`); + logger.debug(statement); return statement; } diff --git a/CommonServer/Services/BillingService.ts b/CommonServer/Services/BillingService.ts index 8a771d532d..84270de00d 100644 --- a/CommonServer/Services/BillingService.ts +++ b/CommonServer/Services/BillingService.ts @@ -475,11 +475,11 @@ export class BillingService extends BaseService { meteredSubscriptionId: string; trialEndsAt?: Date | undefined; }> { - logger.info('Changing plan'); - logger.info(data); + logger.debug('Changing plan'); + logger.debug(data); if (!this.isBillingEnabled()) { - logger.info(Errors.BillingService.BILLING_NOT_ENABLED); + logger.debug(Errors.BillingService.BILLING_NOT_ENABLED); throw new BadDataException( Errors.BillingService.BILLING_NOT_ENABLED @@ -489,46 +489,46 @@ export class BillingService extends BaseService { const subscription: Stripe.Response = await this.stripe.subscriptions.retrieve(data.subscriptionId); - logger.info('Subscription'); - logger.info(subscription); + logger.debug('Subscription'); + logger.debug(subscription); if (!subscription) { - logger.info(Errors.BillingService.SUBSCRIPTION_NOT_FOUND); + logger.debug(Errors.BillingService.SUBSCRIPTION_NOT_FOUND); throw new BadDataException( Errors.BillingService.SUBSCRIPTION_NOT_FOUND ); } - logger.info('Subscription status'); - logger.info(subscription.status); + logger.debug('Subscription status'); + logger.debug(subscription.status); const paymentMethods: Array = await this.getPaymentMethods(subscription.customer.toString()); - logger.info('Payment methods'); - logger.info(paymentMethods); + logger.debug('Payment methods'); + logger.debug(paymentMethods); if (paymentMethods.length === 0) { - logger.info('No payment methods'); + logger.debug('No payment methods'); throw new BadDataException( Errors.BillingService.NO_PAYMENTS_METHODS ); } - logger.info('Cancelling subscriptions'); - logger.info(data.subscriptionId); + logger.debug('Cancelling subscriptions'); + logger.debug(data.subscriptionId); await this.cancelSubscription(data.subscriptionId); - logger.info('Cancelling metered subscriptions'); - logger.info(data.meteredSubscriptionId); + logger.debug('Cancelling metered subscriptions'); + logger.debug(data.meteredSubscriptionId); await this.cancelSubscription(data.meteredSubscriptionId); if (data.endTrialAt && !OneUptimeDate.isInTheFuture(data.endTrialAt)) { data.endTrialAt = undefined; } - logger.info('Subscribing to plan'); + logger.debug('Subscribing to plan'); const subscribeToPlan: { subscriptionId: string; @@ -546,7 +546,7 @@ export class BillingService extends BaseService { promoCode: undefined, }); - logger.info('Subscribed to plan'); + logger.debug('Subscribed to plan'); const value: { subscriptionId: string; diff --git a/CommonServer/Services/ProjectService.ts b/CommonServer/Services/ProjectService.ts index 17384a2419..4e2448995c 100755 --- a/CommonServer/Services/ProjectService.ts +++ b/CommonServer/Services/ProjectService.ts @@ -296,7 +296,7 @@ export class Service extends DatabaseService { project.paymentProviderPlanId !== updateBy.data.paymentProviderPlanId ) { - logger.info('Changing plan for project ' + project.id); + logger.debug('Changing plan for project ' + project.id); const plan: SubscriptionPlan | undefined = SubscriptionPlan.getSubscriptionPlanById( @@ -308,7 +308,7 @@ export class Service extends DatabaseService { throw new BadDataException('Invalid plan'); } - logger.info( + logger.debug( 'Changing plan for project ' + project.id?.toString() + ' to ' + @@ -322,7 +322,7 @@ export class Service extends DatabaseService { ); } - logger.info( + logger.debug( 'Changing plan for project ' + project.id?.toString() + ' to ' + @@ -351,7 +351,7 @@ export class Service extends DatabaseService { endTrialAt: project.trialEndsAt, }); - logger.info( + logger.debug( 'Changing plan for project ' + project.id?.toString() + ' to ' + @@ -379,7 +379,7 @@ export class Service extends DatabaseService { }, }); - logger.info( + logger.debug( 'Changing plan for project ' + project.id?.toString() + ' to ' + @@ -1040,7 +1040,7 @@ export class Service extends DatabaseService { } public async reactiveSubscription(projectId: ObjectID): Promise { - logger.info('Reactivating subscription for project ' + projectId); + logger.debug('Reactivating subscription for project ' + projectId); const project: Model | null = await this.findOneById({ id: projectId!, diff --git a/CommonServer/Services/StatusPageDomainService.ts b/CommonServer/Services/StatusPageDomainService.ts index 705182e2ab..531a2e6b50 100644 --- a/CommonServer/Services/StatusPageDomainService.ts +++ b/CommonServer/Services/StatusPageDomainService.ts @@ -284,8 +284,8 @@ export class Service extends DatabaseService { return false; } catch (err) { - logger.info('Failed checking for CNAME ' + fullDomain); - logger.info(err); + logger.debug('Failed checking for CNAME ' + fullDomain); + logger.debug(err); await this.updateCnameStatusForStatusPageDomain({ domain: fullDomain, @@ -321,7 +321,7 @@ export class Service extends DatabaseService { throw new BadDataException('Domain not found'); } - logger.info( + logger.debug( `StatusPageCerts:RemoveCerts - Checking CNAME ${statusPageDomain.fullDomain}` ); @@ -414,7 +414,7 @@ export class Service extends DatabaseService { return await this.isCnameValid(fullDomain); }, notifyDomainRemoved: async (domain: string) => { - logger.info(`Domain removed from greenlock: ${domain}`); + logger.debug(`Domain removed from greenlock: ${domain}`); }, }); } diff --git a/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts b/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts index 3dceff7337..85f07e63dc 100644 --- a/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts +++ b/CommonServer/Tests/Services/AnalyticsDatabaseService.test.ts @@ -77,12 +77,12 @@ describe('AnalyticsDatabaseService', () => { '' ); - expect(jest.mocked(logger.info)).toHaveBeenCalledTimes(2); - expect(jest.mocked(logger.info)).toHaveBeenNthCalledWith( + expect(jest.mocked(logger.debug)).toHaveBeenCalledTimes(2); + expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith( 1, ' Count Statement' ); - expect(jest.mocked(logger.info)).toHaveBeenNthCalledWith( + expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith( 2, statement ); @@ -185,12 +185,12 @@ describe('AnalyticsDatabaseService', () => { '' ); - expect(jest.mocked(logger.info)).toHaveBeenCalledTimes(2); - expect(jest.mocked(logger.info)).toHaveBeenNthCalledWith( + expect(jest.mocked(logger.debug)).toHaveBeenCalledTimes(2); + expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith( 1, ' Find Statement' ); - expect(jest.mocked(logger.info)).toHaveBeenNthCalledWith( + expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith( 2, statement ); @@ -231,12 +231,12 @@ describe('AnalyticsDatabaseService', () => { service.statementGenerator.toWhereStatement ).toBeCalledWith(''); - expect(jest.mocked(logger.info)).toHaveBeenCalledTimes(2); - expect(jest.mocked(logger.info)).toHaveBeenNthCalledWith( + expect(jest.mocked(logger.debug)).toHaveBeenCalledTimes(2); + expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith( 1, ' Delete Statement' ); - expect(jest.mocked(logger.info)).toHaveBeenNthCalledWith( + expect(jest.mocked(logger.debug)).toHaveBeenNthCalledWith( 2, statement ); diff --git a/CommonServer/Types/Domain.ts b/CommonServer/Types/Domain.ts index 13ebb5488f..b204047ec4 100644 --- a/CommonServer/Types/Domain.ts +++ b/CommonServer/Types/Domain.ts @@ -23,10 +23,10 @@ export default class Domain extends DomainCommon { return reject(err); } - logger.info('Verify TXT Record'); - logger.info('Domain ' + domain.toString()); - logger.info('Data: '); - logger.info(data); + logger.debug('Verify TXT Record'); + logger.debug('Domain ' + domain.toString()); + logger.debug('Data: '); + logger.debug(data); let isVerified: boolean = false; for (const item of data) { diff --git a/CommonServer/Utils/BasicCron.ts b/CommonServer/Utils/BasicCron.ts index 758ce3bfb5..38229c1fb4 100644 --- a/CommonServer/Utils/BasicCron.ts +++ b/CommonServer/Utils/BasicCron.ts @@ -20,17 +20,17 @@ const BasicCron: BasicCronFunction = async ( cron.schedule(options.schedule, async () => { try { - logger.info(`Job ${jobName} Start`); + logger.debug(`Job ${jobName} Start`); await runFunction(); - logger.info(`Job ${jobName} End`); + logger.debug(`Job ${jobName} End`); } catch (e) { - logger.info(`Job ${jobName} Error`); + logger.debug(`Job ${jobName} Error`); logger.error(e); } }); if (options.runOnStartup) { - logger.info(`Job ${jobName} - Start on Startup`); + logger.debug(`Job ${jobName} - Start on Startup`); await runFunction(); } }; diff --git a/CommonServer/Utils/Express.ts b/CommonServer/Utils/Express.ts index 2fbcc6618d..1123cca89e 100644 --- a/CommonServer/Utils/Express.ts +++ b/CommonServer/Utils/Express.ts @@ -87,7 +87,7 @@ class Express { port?.toNumber() || this.app.get('port'), () => { // eslint-disable-next-line - logger.info(`${appName} server started on port: ${port?.toNumber() || this.app.get('port')}`); + logger.debug(`${appName} server started on port: ${port?.toNumber() || this.app.get('port')}`); return resolve(this.app); } ); diff --git a/CommonServer/Utils/Greenlock/Greenlock.ts b/CommonServer/Utils/Greenlock/Greenlock.ts index 1e03cd8779..851770ebee 100644 --- a/CommonServer/Utils/Greenlock/Greenlock.ts +++ b/CommonServer/Utils/Greenlock/Greenlock.ts @@ -23,7 +23,7 @@ export default class GreenlockUtil { validateCname: (domain: string) => Promise; notifyDomainRemoved: (domain: string) => Promise; }): Promise { - logger.info('Renewing all certificates'); + logger.debug('Renewing all certificates'); // get all certificates which are expiring soon diff --git a/CommonServer/Utils/Probe/ProbeMonitorResponse.ts b/CommonServer/Utils/Probe/ProbeMonitorResponse.ts index 509545d6c8..8bfc5ac62f 100644 --- a/CommonServer/Utils/Probe/ProbeMonitorResponse.ts +++ b/CommonServer/Utils/Probe/ProbeMonitorResponse.ts @@ -61,8 +61,8 @@ export default class ProbeMonitorResponseService { rootCause: null, }; - logger.info('Processing probe response'); - logger.info('Monitor ID: ' + dataToProcess.monitorId); + logger.debug('Processing probe response'); + logger.debug('Monitor ID: ' + dataToProcess.monitorId); // fetch monitor const monitor: Monitor | null = await MonitorService.findOneById({ @@ -87,7 +87,7 @@ export default class ProbeMonitorResponseService { } if (monitor.disableActiveMonitoring) { - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} Monitor is disabled. Please enable it to start monitoring again.` ); @@ -97,7 +97,7 @@ export default class ProbeMonitorResponseService { } if (monitor.disableActiveMonitoringBecauseOfManualIncident) { - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} Monitor is disabled because an incident which is created manually is not resolved. Please resolve the incident to start monitoring again.` ); @@ -107,7 +107,7 @@ export default class ProbeMonitorResponseService { } if (monitor.disableActiveMonitoringBecauseOfScheduledMaintenanceEvent) { - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} Monitor is disabled because one of the scheduled maintenance event this monitor is attached to has not ended. Please end the scheduled maintenance event to start monitoring again.` ); @@ -119,7 +119,7 @@ export default class ProbeMonitorResponseService { // save the last log to MonitorProbe. // get last log. We do this because there are many monitoring steps and we need to store those. - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} - monitor type ${ monitor.monitorType }` @@ -223,7 +223,7 @@ export default class ProbeMonitorResponseService { monitorSteps.data?.monitorStepsInstanceArray.length === 0 ) { // no steps, ignore everything. This happens when the monitor is updated shortly after the probing attempt. - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} - No monitoring steps.` ); return response; @@ -327,12 +327,12 @@ export default class ProbeMonitorResponseService { }); if (response.criteriaMetId && response.rootCause) { - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} - Criteria met: ${ response.criteriaMetId }` ); - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} - Root cause: ${ response.rootCause }` @@ -351,7 +351,7 @@ export default class ProbeMonitorResponseService { monitor.currentMonitorStatusId?.toString() !== monitorSteps.data.defaultMonitorStatusId.toString() ) { - logger.info( + logger.debug( `${dataToProcess.monitorId.toString()} - No criteria met. Change to default status.` ); @@ -630,7 +630,7 @@ export default class ProbeMonitorResponseService { input.criteriaInstance.data?.monitorStatusId.toString() !== input.monitor.currentMonitorStatusId?.toString() ) { - logger.info( + logger.debug( `${input.monitor.id?.toString()} - Change monitor status to ${input.criteriaInstance.data?.monitorStatusId.toString()}` ); // change monitor status @@ -659,7 +659,7 @@ export default class ProbeMonitorResponseService { } // check open incidents - logger.info(`${input.monitor.id?.toString()} - Check open incidents.`); + logger.debug(`${input.monitor.id?.toString()} - Check open incidents.`); // check active incidents and if there are open incidents, do not cretae anothr incident. const openIncidents: Array = await this.checkOpenIncidentsAndCloseIfResolved({ @@ -691,11 +691,11 @@ export default class ProbeMonitorResponseService { const hasAlreadyOpenIncident: boolean = Boolean(alreadyOpenIncident); - logger.info( + logger.debug( `${input.monitor.id?.toString()} - Open Incident ${alreadyOpenIncident?.id?.toString()}` ); - logger.info( + logger.debug( `${input.monitor.id?.toString()} - Has open incident ${hasAlreadyOpenIncident}` ); @@ -705,7 +705,7 @@ export default class ProbeMonitorResponseService { // create incident here. - logger.info( + logger.debug( `${input.monitor.id?.toString()} - Create incident.` ); diff --git a/CommonServer/Utils/Process.ts b/CommonServer/Utils/Process.ts index dab988a87b..607bbcb497 100644 --- a/CommonServer/Utils/Process.ts +++ b/CommonServer/Utils/Process.ts @@ -2,7 +2,7 @@ import logger from './Logger'; process.on('exit', () => { - logger.info('Server Shutting Shutdown'); + logger.debug('Server Shutting Shutdown'); }); process.on( diff --git a/CommonServer/Utils/Realtime.ts b/CommonServer/Utils/Realtime.ts index bc1c5844d3..9699c7e5c2 100644 --- a/CommonServer/Utils/Realtime.ts +++ b/CommonServer/Utils/Realtime.ts @@ -25,7 +25,7 @@ export default abstract class Realtime { public static async init(): Promise { if (!this.socketServer) { this.socketServer = IO.getSocketServer(); - logger.info('Realtime socket server initialized'); + logger.debug('Realtime socket server initialized'); } this.socketServer!.on('connection', (socket: Socket) => { diff --git a/CommonServer/Utils/StartServer.ts b/CommonServer/Utils/StartServer.ts index 46e86f8ec9..828f438970 100644 --- a/CommonServer/Utils/StartServer.ts +++ b/CommonServer/Utils/StartServer.ts @@ -146,7 +146,7 @@ const init: InitFunction = async ( ): Promise => { const { appName, port, isFrontendApp = false } = data; - logger.info(`App Version: ${AppVersion.toString()}`); + logger.debug(`App Version: ${AppVersion.toString()}`); await Express.launchApplication(appName, port); LocalCache.setString('app', 'name', appName); diff --git a/Dashboard/Serve.ts b/Dashboard/Serve.ts index 70b72a0172..001f63c40a 100755 --- a/Dashboard/Serve.ts +++ b/Dashboard/Serve.ts @@ -31,7 +31,7 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/Examples/otel-dotnet/bin/Debug/net6.0/Google.Protobuf.dll.txt b/Examples/otel-dotnet/bin/Debug/net6.0/Google.Protobuf.dll.txt deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/Ingestor/API/FluentIngest.ts b/Ingestor/API/FluentIngest.ts index e43558029d..dd2f48874b 100644 --- a/Ingestor/API/FluentIngest.ts +++ b/Ingestor/API/FluentIngest.ts @@ -42,7 +42,7 @@ router.post( next: NextFunction ): Promise => { try { - logger.info('Fluent Ingestor API called'); + logger.debug('Fluent Ingestor API called'); const dbLogs: Array = []; diff --git a/Ingestor/Index.ts b/Ingestor/Index.ts index dd8fd7f5d3..760962ada7 100644 --- a/Ingestor/Index.ts +++ b/Ingestor/Index.ts @@ -74,6 +74,6 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/IsolatedVM/API/VM.ts b/IsolatedVM/API/VM.ts index 48ab976b01..00abd86b9e 100644 --- a/IsolatedVM/API/VM.ts +++ b/IsolatedVM/API/VM.ts @@ -31,8 +31,8 @@ router.post( ); } - logger.info('Running code in sandbox'); - logger.info(req.body.code); + logger.debug('Running code in sandbox'); + logger.debug(req.body.code); let result: ReturnResult | null = null; @@ -49,11 +49,11 @@ router.post( throw new BadDataException((err as Error).message); } - logger.info('Code execution completed'); - logger.info(result.returnValue); + logger.debug('Code execution completed'); + logger.debug(result.returnValue); - logger.info('Code Logs '); - logger.info(result.logMessages); + logger.debug('Code Logs '); + logger.debug(result.logMessages); if (typeof result.returnValue === 'object') { result.returnValue = JSONFunctions.removeCircularReferences( diff --git a/IsolatedVM/Index.ts b/IsolatedVM/Index.ts index 044563d166..c7789a9602 100644 --- a/IsolatedVM/Index.ts +++ b/IsolatedVM/Index.ts @@ -23,7 +23,7 @@ const init: PromiseVoidFunction = async (): Promise => { readyCheck: async () => {}, }, }); - logger.info('App Init Success'); + logger.debug('App Init Success'); // add default routes await App.addDefaultRoutes(); @@ -36,6 +36,6 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/Nginx/Index.ts b/Nginx/Index.ts index 247e160e74..30f77a8575 100644 --- a/Nginx/Index.ts +++ b/Nginx/Index.ts @@ -48,6 +48,6 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/Probe/Index.ts b/Probe/Index.ts index f79973142c..ccbf718df0 100644 --- a/Probe/Index.ts +++ b/Probe/Index.ts @@ -30,7 +30,7 @@ const init: PromiseVoidFunction = async (): Promise => { // Register this probe. await Register.registerProbe(); - logger.info('Probe registered'); + logger.debug('Probe registered'); await Register.reportIfOffline(); } catch (err) { @@ -47,7 +47,7 @@ const init: PromiseVoidFunction = async (): Promise => { const currentWorker: number = workers; - logger.info(`Starting worker ${currentWorker}`); + logger.debug(`Starting worker ${currentWorker}`); new FetchListAndProbe('Worker ' + currentWorker) .run() @@ -71,6 +71,6 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/Probe/Jobs/Alive.ts b/Probe/Jobs/Alive.ts index ee35521467..ea70072a5f 100644 --- a/Probe/Jobs/Alive.ts +++ b/Probe/Jobs/Alive.ts @@ -15,7 +15,7 @@ BasicCron({ runOnStartup: false, }, runFunction: async () => { - logger.info('Checking if probe is alive...'); + logger.debug('Checking if probe is alive...'); const probeId: string | undefined = LocalCache.getString( 'PROBE', @@ -30,7 +30,7 @@ BasicCron({ return; } - logger.info('Probe ID: ' + probeId.toString()); + logger.debug('Probe ID: ' + probeId.toString()); await API.post( URL.fromString(INGESTOR_URL.toString()).addRoute('/alive'), diff --git a/Probe/Jobs/Monitor/FetchList.ts b/Probe/Jobs/Monitor/FetchList.ts index 85e4bd913c..79a353f519 100644 --- a/Probe/Jobs/Monitor/FetchList.ts +++ b/Probe/Jobs/Monitor/FetchList.ts @@ -21,17 +21,17 @@ export default class FetchListAndProbe { } public async run(): Promise { - logger.info(`Running worker ${this.workerName}`); + logger.debug(`Running worker ${this.workerName}`); // eslint-disable-next-line no-constant-condition while (true) { const runTime: Date = OneUptimeDate.getCurrentDate(); - logger.info(`Probing monitors ${this.workerName}`); + logger.debug(`Probing monitors ${this.workerName}`); await this.fetchListAndProbe(); - logger.info(`Probing monitors ${this.workerName} complete`); + logger.debug(`Probing monitors ${this.workerName} complete`); // if rumTime + 5 seconds is in the future, then this fetchLst either errored out or had no monitors in the list. Either way, wait for 5 seconds and proceed. @@ -41,7 +41,7 @@ export default class FetchListAndProbe { ); if (OneUptimeDate.isInTheFuture(twoSecondsAdded)) { - logger.info( + logger.debug( `Worker ${this.workerName} is waiting for 2 seconds` ); await Sleep.sleep(2000); @@ -51,7 +51,10 @@ export default class FetchListAndProbe { private async fetchListAndProbe(): Promise { try { - logger.info('Fetching monitor list'); + + debugger; + + logger.debug('Fetching monitor list'); const monitorListUrl: URL = URL.fromString( INGESTOR_URL.toString() @@ -69,8 +72,8 @@ export default class FetchListAndProbe { {} ); - logger.info('Fetched monitor list'); - logger.info(result); + logger.debug('Fetched monitor list'); + logger.debug(result); const monitors: Array = BaseModel.fromJSONArray( result.data as JSONArray, @@ -78,6 +81,8 @@ export default class FetchListAndProbe { ); for (const monitor of monitors) { + + debugger; try { await MonitorUtil.probeMonitor(monitor); } catch (err) { diff --git a/Probe/Services/Register.ts b/Probe/Services/Register.ts index 44683f993e..e51e84e2f0 100644 --- a/Probe/Services/Register.ts +++ b/Probe/Services/Register.ts @@ -82,9 +82,9 @@ export default class Register { while (currentRetry < maxRetry) { try { - logger.info(`Registering probe. Attempt: ${currentRetry + 1}`); + logger.debug(`Registering probe. Attempt: ${currentRetry + 1}`); await Register._registerProbe(); - logger.info(`Probe registered successfully.`); + logger.debug(`Probe registered successfully.`); break; } catch (error) { logger.error( @@ -103,8 +103,8 @@ export default class Register { INGESTOR_URL.toString() ).addRoute('/register'); - logger.info('Registering Probe...'); - logger.info( + logger.debug('Registering Probe...'); + logger.debug( 'Sending request to: ' + probeRegistrationUrl.toString() ); @@ -119,7 +119,7 @@ export default class Register { ); if (result.isSuccess()) { - logger.info('Probe Registered'); + logger.debug('Probe Registered'); const probeId: string = result.data['_id'] as string; @@ -147,7 +147,7 @@ export default class Register { ); } - logger.info( + logger.debug( `Probe ID: ${ LocalCache.getString('PROBE', 'PROBE_ID') || 'Unknown' }` diff --git a/Probe/Utils/Monitors/Monitor.ts b/Probe/Utils/Monitors/Monitor.ts index 7f985d4a57..6a995d5736 100644 --- a/Probe/Utils/Monitors/Monitor.ts +++ b/Probe/Utils/Monitors/Monitor.ts @@ -39,7 +39,7 @@ export default class MonitorUtil { !monitor.monitorSteps || monitor.monitorSteps.data?.monitorStepsInstanceArray.length === 0 ) { - logger.info('No monitor steps found'); + logger.debug('No monitor steps found'); return []; } diff --git a/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts index 252006b0d7..93d240953d 100644 --- a/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts +++ b/Probe/Utils/Monitors/MonitorTypes/ApiMonitor.ts @@ -54,7 +54,7 @@ export default class ApiMonitor { } try { - logger.info( + logger.debug( `API Monitor - Pinging ${options.monitorId?.toString()} ${requestType} ${url.toString()} - Retry: ${ options.currentRetryCount }` @@ -130,7 +130,7 @@ export default class ApiMonitor { failureCause: '', }; - logger.info( + logger.debug( `API Monitor - Pinging ${options.monitorId?.toString()} ${requestType} ${url.toString()} Success - Response: ${JSON.stringify( apiResponse )}` @@ -179,7 +179,7 @@ export default class ApiMonitor { (err as any).toString().includes('timeout') && (err as any).toString().includes('exceeded') ) { - logger.info( + logger.debug( `API Monitor - Timeout exceeded ${options.monitorId?.toString()} ${requestType} ${url.toString()} - ERROR: ${err}` ); diff --git a/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts index 18219b6295..69d9f8ef1c 100644 --- a/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts +++ b/Probe/Utils/Monitors/MonitorTypes/PingMonitor.ts @@ -54,7 +54,7 @@ export default class PingMonitor { hostAddress = host.toString(); } - logger.info( + logger.debug( `Pinging host: ${pingOptions?.monitorId?.toString()} ${hostAddress} - Retry: ${ pingOptions?.currentRetryCount }` @@ -70,10 +70,10 @@ export default class PingMonitor { } ); - logger.info( + logger.debug( `Pinging host ${pingOptions?.monitorId?.toString()} ${hostAddress} success: ` ); - logger.info(res); + logger.debug(res); if (!res.alive) { throw new UnableToReachServer( @@ -103,10 +103,10 @@ export default class PingMonitor { failureCause: '', }; } catch (err: unknown) { - logger.info( + logger.debug( `Pinging host ${pingOptions?.monitorId?.toString()} ${hostAddress} error: ` ); - logger.info(err); + logger.debug(err); if (!pingOptions) { pingOptions = {}; @@ -127,7 +127,7 @@ export default class PingMonitor { (err as any).toString().includes('timeout') && (err as any).toString().includes('exceeded') ) { - logger.info( + logger.debug( `Ping Monitor - Timeout exceeded ${pingOptions.monitorId?.toString()} ${host.toString()} - ERROR: ${err}` ); diff --git a/Probe/Utils/Monitors/MonitorTypes/PortMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/PortMonitor.ts index b1a9ec441d..bd9a4f2af6 100644 --- a/Probe/Utils/Monitors/MonitorTypes/PortMonitor.ts +++ b/Probe/Utils/Monitors/MonitorTypes/PortMonitor.ts @@ -63,7 +63,7 @@ export default class PortMonitor { throw new BadDataException('Port is not specified'); } - logger.info( + logger.debug( `Pinging host: ${pingOptions?.monitorId?.toString()} ${hostAddress}:${port.toString()} - Retry: ${ pingOptions?.currentRetryCount }` @@ -100,7 +100,7 @@ export default class PortMonitor { (endTime[0] * 1000000000 + endTime[1]) / 1000000 ); - logger.info( + logger.debug( `Pinging host ${pingOptions?.monitorId?.toString()} ${hostAddress}:${port!.toString()} success: Response Time ${responseTimeInMS} ms` ); @@ -115,7 +115,7 @@ export default class PortMonitor { socket.on('timeout', () => { socket.destroy(); - logger.info('Ping timeout'); + logger.debug('Ping timeout'); if (!hasPromiseResolved) { reject(new UnableToReachServer('Ping timeout')); @@ -127,7 +127,7 @@ export default class PortMonitor { socket.on('error', (error: Error) => { socket.destroy(); - logger.info( + logger.debug( 'Could not connect to: ' + host + ':' + port ); @@ -161,11 +161,11 @@ export default class PortMonitor { failureCause: '', }; } catch (err: unknown) { - logger.info( + logger.debug( `Pinging host ${pingOptions?.monitorId?.toString()} ${hostAddress}:${port.toString()} error: ` ); - logger.info(err); + logger.debug(err); if (!pingOptions) { pingOptions = {}; diff --git a/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts index 665adfa5c1..93ca7b2db5 100644 --- a/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts +++ b/Probe/Utils/Monitors/MonitorTypes/SslMonitor.ts @@ -40,7 +40,7 @@ export default class SSLMonitor { pingOptions.currentRetryCount = 1; } - logger.info( + logger.debug( `Pinging host: ${pingOptions?.monitorId?.toString()} ${url.toString()} - Retry: ${ pingOptions?.currentRetryCount }` @@ -52,17 +52,17 @@ export default class SSLMonitor { url.hostname.port?.toNumber() || 443 ); - logger.info( + logger.debug( `Pinging host ${pingOptions?.monitorId?.toString()} ${url.toString()} success: ` ); - logger.info(res); + logger.debug(res); return res; } catch (err: unknown) { - logger.info( + logger.debug( `Pinging host ${pingOptions?.monitorId?.toString()} ${url.toString()} error: ` ); - logger.info(err); + logger.debug(err); if (!pingOptions) { pingOptions = {}; @@ -83,7 +83,7 @@ export default class SSLMonitor { (err as any).toString().includes('timeout') && (err as any).toString().includes('exceeded') ) { - logger.info( + logger.debug( `Ping Monitor - Timeout exceeded ${pingOptions.monitorId?.toString()} ${url.toString()} - ERROR: ${err}` ); diff --git a/Probe/Utils/Monitors/MonitorTypes/SyntheticMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/SyntheticMonitor.ts index 54752697f8..7077f3954b 100644 --- a/Probe/Utils/Monitors/MonitorTypes/SyntheticMonitor.ts +++ b/Probe/Utils/Monitors/MonitorTypes/SyntheticMonitor.ts @@ -22,9 +22,11 @@ export default class SyntheticMonitor { ): Promise | null> { const results: Array = []; + debugger; + for (const browserType of options.browserTypes || []) { for (const screenSizeType of options.screenSizeTypes || []) { - logger.info( + logger.debug( `Running Synthetic Monitor: ${options?.monitorId?.toString()}, Screen Size: ${screenSizeType}, Browser: ${browserType}` ); @@ -117,10 +119,6 @@ export default class SyntheticMonitor { (err as Error)?.message || (err as Error).toString(); } - if (pageAndBrowser?.page) { - await pageAndBrowser.page.close(); - } - if (pageAndBrowser?.browser) { await pageAndBrowser.browser.close(); } diff --git a/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts b/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts index dd6d762d52..3a67794501 100644 --- a/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts +++ b/Probe/Utils/Monitors/MonitorTypes/WebsiteMonitor.ts @@ -49,7 +49,7 @@ export default class WebsiteMonitor { } try { - logger.info( + logger.debug( `Website Monitor - Pinging ${options.monitorId?.toString()} ${requestType} ${url.toString()} - Retry: ${ options.currentRetryCount }` @@ -101,7 +101,7 @@ export default class WebsiteMonitor { failureCause: '', }; - logger.info( + logger.debug( `Website Monitor - Pinging ${options.monitorId?.toString()} ${requestType} ${url.toString()} Success - Response: ${JSON.stringify( probeWebsiteResponse )}` @@ -157,7 +157,7 @@ export default class WebsiteMonitor { (err as any).toString().includes('timeout') && (err as any).toString().includes('exceeded') ) { - logger.info( + logger.debug( `Website Monitor - Timeout exceeded ${options.monitorId?.toString()} ${requestType} ${url.toString()} - ERROR: ${err}` ); probeWebsiteResponse.failureCause = 'Timeout exceeded'; diff --git a/StatusPage/Serve.ts b/StatusPage/Serve.ts index 9753f13e77..cb759cb663 100644 --- a/StatusPage/Serve.ts +++ b/StatusPage/Serve.ts @@ -29,7 +29,7 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); }); diff --git a/TestServer/API/Main.ts b/TestServer/API/Main.ts index ff482ba94c..51861f70ff 100644 --- a/TestServer/API/Main.ts +++ b/TestServer/API/Main.ts @@ -42,10 +42,10 @@ const returnResponse: RequestHandler = async ( next: NextFunction ): Promise => { try { - logger.info('Request Headers: '); - logger.info(req.headers); - logger.info('Request Body: '); - logger.info(req.body); + logger.debug('Request Headers: '); + logger.debug(req.headers); + logger.debug('Request Body: '); + logger.debug(req.body); const responseCode: number | undefined = LocalCache.getNumber('TestServer', 'responseCode') || 200; @@ -56,12 +56,12 @@ const returnResponse: RequestHandler = async ( let responseHeaders: JSONValue | undefined = LocalCache.getJSON('TestServer', 'responseHeaders') || {}; - logger.info('Response Code: ' + responseCode); - logger.info('Response Time: ' + responseTime); - logger.info('Response Body: '); - logger.info(responseBody); - logger.info('Response Headers: '); - logger.info(responseHeaders); + logger.debug('Response Code: ' + responseCode); + logger.debug('Response Time: ' + responseTime); + logger.debug('Response Body: '); + logger.debug(responseBody); + logger.debug('Response Headers: '); + logger.debug(responseHeaders); if (responseHeaders && typeof responseHeaders === Typeof.String) { responseHeaders = JSON.parse(responseHeaders.toString()); diff --git a/TestServer/Index.ts b/TestServer/Index.ts index e5ed9c14f8..7c0321f3f8 100644 --- a/TestServer/Index.ts +++ b/TestServer/Index.ts @@ -37,6 +37,6 @@ const init: PromiseVoidFunction = async (): Promise => { init().catch((err: Error) => { logger.error(err); - logger.info('Exiting node process'); + logger.debug('Exiting node process'); process.exit(1); });