BlueWave Uptime
An open source server monitoring application
@@ -26,29 +25,31 @@ BlueWave Uptime is an open source server monitoring application used to track th - [ ] Scheduled maintenance (in the works) **Roadmap (short term):** + - [ ] Memory, disk and CPU monitoring - [ ] 3rd party integrations - [ ] DNS monitoring - [ ] SSL monitoring **Roadmap (long term):** + - [ ] Status pages ## Tech stack -* [ReactJs](https://react.dev/) -* [MUI (React framework)](https://mui.com/) -* [Node.js](https://nodejs.org/en) -* [MongoDB](https://mongodb.com) +- [ReactJs](https://react.dev/) +- [MUI (React framework)](https://mui.com/) +- [Node.js](https://nodejs.org/en) +- [MongoDB](https://mongodb.com) ## Contributing We love contributors. Here's how you can contribute: -* Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md). -* Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only. -* Open an issue if you believe you've encountered a bug -* Make a pull request to add new features/make quality-of-life improvements/fix bugs. +- Check [Contributor's guideline](https://github.com/bluewave-labs/bluewave-uptime/blob/master/CONTRIBUTING.md). +- Have a look at our Figma designs [here](https://www.figma.com/design/RPSfaw66HjzSwzntKcgDUV/Uptime-Genie?node-id=0-1&t=WqOFv9jqNTFGItpL-1). We encourage you to copy to your own Figma page, then work on it as it is read-only. +- Open an issue if you believe you've encountered a bug +- Make a pull request to add new features/make quality-of-life improvements/fix bugs.### Client @@ -2112,4 +2145,3 @@ const myRoute = async(req, res, next) => { ``` Errors should not be handled at the controller level and should be left to the middleware to handle. - diff --git a/Server/models/Check.js b/Server/models/Check.js index 66984d545..a9ac7f288 100644 --- a/Server/models/Check.js +++ b/Server/models/Check.js @@ -85,43 +85,38 @@ CheckSchema.pre("save", async function (next) { }); // Check if there are any notifications - if (notifications && notifications.length > 0) { - // Only send email if monitor status has changed - if (monitor.status !== this.status) { - const emailService = new EmailService(); - if (monitor.status === true && this.status === false) { - // Notify users that the monitor is down - for (const notification of notifications) { - if (notification.type === "email") { - await emailService.buildAndSendEmail( - "serverIsDownTemplate", - { monitorName: monitor.name, monitorUrl: monitor.url }, - notification.address, - `Monitor ${monitor.name} is down` - ); - } - } - } + // Only send email if monitor status has changed + if (monitor.status !== this.status) { + const emailService = new EmailService(); - if (monitor.status === false && this.status === true) { - // Notify users that the monitor is up - for (const notification of notifications) { - if (notification.type === "email") { - await emailService.buildAndSendEmail( - "serverIsUpTemplate", - { monitorName: monitor.name, monitorUrl: monitor.url }, - notification.address, - `Monitor ${monitor.name} is back up` - ); - } - } - } - - // Update monitor status - monitor.status = this.status; - await monitor.save(); + let template = ""; + let status = ""; + if (monitor.status === true && this.status === false) { + template = "serverIsDownTemplate"; + status = "down"; } + + if (monitor.status === false && this.status === true) { + // Notify users that the monitor is up + template = "serverIsUpTemplate"; + status = "up"; + } + + for (const notification of notifications) { + if (notification.type === "email") { + await emailService.buildAndSendEmail( + template, + { monitorName: monitor.name, monitorUrl: monitor.url }, + notification.address, + `Monitor ${monitor.name} is ${status}` + ); + } + } + + // Update monitor status + monitor.status = this.status; + await monitor.save(); } } } catch (error) { diff --git a/Server/package-lock.json b/Server/package-lock.json index 6f11e3a2e..d2ad88cff 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -984,10 +984,9 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz", - "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==", - "license": "MIT", + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz", + "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0",