Merge pull request #2718 from bluewave-labs/feat/hardware-module
module -> class
This commit is contained in:
4 files changed
+24
-76
No files matched your search
@@ -51,7 +51,7 @@ import InviteModule from "../db/mongo/modules/inviteModule.js";
|
|||||||
import CheckModule from "../db/mongo/modules/checkModule.js";
|
import CheckModule from "../db/mongo/modules/checkModule.js";
|
||||||
import StatusPageModule from "../db/mongo/modules/statusPageModule.js";
|
import StatusPageModule from "../db/mongo/modules/statusPageModule.js";
|
||||||
import UserModule from "../db/mongo/modules/userModule.js";
|
import UserModule from "../db/mongo/modules/userModule.js";
|
||||||
|
import HardwareCheckModule from "../db/mongo/modules/hardwareCheckModule.js";
|
||||||
export const initializeServices = async ({ logger, envSettings, settingsService }) => {
|
export const initializeServices = async ({ logger, envSettings, settingsService }) => {
|
||||||
const serviceRegistry = new ServiceRegistry({ logger });
|
const serviceRegistry = new ServiceRegistry({ logger });
|
||||||
ServiceRegistry.instance = serviceRegistry;
|
ServiceRegistry.instance = serviceRegistry;
|
||||||
@@ -66,7 +66,8 @@ export const initializeServices = async ({ logger, envSettings, settingsService
|
|||||||
const inviteModule = new InviteModule({ InviteToken, crypto, stringService });
|
const inviteModule = new InviteModule({ InviteToken, crypto, stringService });
|
||||||
const statusPageModule = new StatusPageModule({ StatusPage, NormalizeData, stringService });
|
const statusPageModule = new StatusPageModule({ StatusPage, NormalizeData, stringService });
|
||||||
const userModule = new UserModule({ User, Team, GenerateAvatarImage, ParseBoolean, stringService });
|
const userModule = new UserModule({ User, Team, GenerateAvatarImage, ParseBoolean, stringService });
|
||||||
const db = new MongoDB({ logger, envSettings, checkModule, inviteModule, statusPageModule, userModule });
|
const hardwareCheckModule = new HardwareCheckModule({ HardwareCheck, Monitor, logger });
|
||||||
|
const db = new MongoDB({ logger, envSettings, checkModule, inviteModule, statusPageModule, userModule, hardwareCheckModule });
|
||||||
|
|
||||||
await db.connect();
|
await db.connect();
|
||||||
|
|
||||||
|
|||||||
@@ -18,11 +18,6 @@ import * as monitorModule from "./modules/monitorModule.js";
|
|||||||
|
|
||||||
import * as pageSpeedCheckModule from "./modules/pageSpeedCheckModule.js";
|
import * as pageSpeedCheckModule from "./modules/pageSpeedCheckModule.js";
|
||||||
|
|
||||||
//****************************************
|
|
||||||
// Hardware Checks
|
|
||||||
//****************************************
|
|
||||||
import * as hardwareCheckModule from "./modules/hardwareCheckModule.js";
|
|
||||||
|
|
||||||
//****************************************
|
//****************************************
|
||||||
// Maintenance Window
|
// Maintenance Window
|
||||||
//****************************************
|
//****************************************
|
||||||
@@ -46,7 +41,7 @@ import * as diagnosticModule from "./modules/diagnosticModule.js";
|
|||||||
class MongoDB {
|
class MongoDB {
|
||||||
static SERVICE_NAME = "MongoDB";
|
static SERVICE_NAME = "MongoDB";
|
||||||
|
|
||||||
constructor({ logger, envSettings, checkModule, inviteModule, statusPageModule, userModule }) {
|
constructor({ logger, envSettings, checkModule, inviteModule, statusPageModule, userModule, hardwareCheckModule }) {
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
this.envSettings = envSettings;
|
this.envSettings = envSettings;
|
||||||
this.userModule = userModule;
|
this.userModule = userModule;
|
||||||
@@ -54,7 +49,7 @@ class MongoDB {
|
|||||||
Object.assign(this, recoveryModule);
|
Object.assign(this, recoveryModule);
|
||||||
Object.assign(this, monitorModule);
|
Object.assign(this, monitorModule);
|
||||||
Object.assign(this, pageSpeedCheckModule);
|
Object.assign(this, pageSpeedCheckModule);
|
||||||
Object.assign(this, hardwareCheckModule);
|
this.hardwareCheckModule = hardwareCheckModule;
|
||||||
this.checkModule = checkModule;
|
this.checkModule = checkModule;
|
||||||
Object.assign(this, maintenanceWindowModule);
|
Object.assign(this, maintenanceWindowModule);
|
||||||
Object.assign(this, notificationModule);
|
Object.assign(this, notificationModule);
|
||||||
|
|||||||
@@ -1,70 +1,22 @@
|
|||||||
import HardwareCheck from "../../models/HardwareCheck.js";
|
|
||||||
import Monitor from "../../models/Monitor.js";
|
|
||||||
import { logger } from "../../../utils/logger.js";
|
|
||||||
|
|
||||||
const SERVICE_NAME = "hardwareCheckModule";
|
const SERVICE_NAME = "hardwareCheckModule";
|
||||||
const createHardwareCheck = async (hardwareCheckData) => {
|
|
||||||
try {
|
|
||||||
const { monitorId, status } = hardwareCheckData;
|
|
||||||
const n = (await HardwareCheck.countDocuments({ monitorId })) + 1;
|
|
||||||
const monitor = await Monitor.findById(monitorId);
|
|
||||||
|
|
||||||
if (!monitor) {
|
class HardwareCheckModule {
|
||||||
logger.error({
|
constructor({ HardwareCheck, Monitor, logger }) {
|
||||||
message: "Monitor not found",
|
this.HardwareCheck = HardwareCheck;
|
||||||
service: SERVICE_NAME,
|
this.Monitor = Monitor;
|
||||||
method: "createHardwareCheck",
|
this.logger = logger;
|
||||||
details: `monitor ID: ${monitorId}`,
|
}
|
||||||
});
|
|
||||||
return null;
|
createHardwareChecks = async (hardwareChecks) => {
|
||||||
|
try {
|
||||||
|
await this.HardwareCheck.insertMany(hardwareChecks, { ordered: false });
|
||||||
|
return true;
|
||||||
|
} catch (error) {
|
||||||
|
error.service = SERVICE_NAME;
|
||||||
|
error.method = "createHardwareChecks";
|
||||||
|
throw error;
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
let newUptimePercentage;
|
export default HardwareCheckModule;
|
||||||
if (monitor.uptimePercentage === undefined) {
|
|
||||||
newUptimePercentage = status === true ? 1 : 0;
|
|
||||||
} else {
|
|
||||||
newUptimePercentage = (monitor.uptimePercentage * (n - 1) + (status === true ? 1 : 0)) / n;
|
|
||||||
}
|
|
||||||
|
|
||||||
await Monitor.findOneAndUpdate({ _id: monitorId }, { uptimePercentage: newUptimePercentage });
|
|
||||||
|
|
||||||
const hardwareCheck = await new HardwareCheck({
|
|
||||||
...hardwareCheckData,
|
|
||||||
}).save();
|
|
||||||
return hardwareCheck;
|
|
||||||
} catch (error) {
|
|
||||||
logger.error({
|
|
||||||
message: "Error creating hardware check",
|
|
||||||
service: SERVICE_NAME,
|
|
||||||
method: "createHardwareCheck",
|
|
||||||
stack: error.stack,
|
|
||||||
});
|
|
||||||
error.service = SERVICE_NAME;
|
|
||||||
error.method = "createHardwareCheck";
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const createHardwareChecks = async (hardwareChecks) => {
|
|
||||||
try {
|
|
||||||
await HardwareCheck.insertMany(hardwareChecks, { ordered: false });
|
|
||||||
return true;
|
|
||||||
} catch (error) {
|
|
||||||
error.service = SERVICE_NAME;
|
|
||||||
error.method = "createHardwareChecks";
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const deleteHardwareChecksByMonitorId = async (monitorId) => {
|
|
||||||
try {
|
|
||||||
const result = await HardwareCheck.deleteMany({ monitorId });
|
|
||||||
return result.deletedCount;
|
|
||||||
} catch (error) {
|
|
||||||
error.service = SERVICE_NAME;
|
|
||||||
error.method = "deleteHardwareChecksByMonitorId";
|
|
||||||
throw error;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export { createHardwareCheck, createHardwareChecks, deleteHardwareChecksByMonitorId };
|
|
||||||
@@ -23,7 +23,7 @@ class BufferService {
|
|||||||
this.OPERATION_MAP = {
|
this.OPERATION_MAP = {
|
||||||
checks: this.db.checkModule.createChecks,
|
checks: this.db.checkModule.createChecks,
|
||||||
pagespeedChecks: this.db.createPageSpeedChecks,
|
pagespeedChecks: this.db.createPageSpeedChecks,
|
||||||
hardwareChecks: this.db.createHardwareChecks,
|
hardwareChecks: this.db.hardwareCheckModule.createHardwareChecks,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.scheduleNextFlush();
|
this.scheduleNextFlush();
|
||||||
|
|||||||
Reference in new issue
Block a user