Merge branch 'master' into Spiritreader_master

# Conflicts:
#	src/pages/EditMonitor.vue

server/model/heartbeat.js

@@ -3,8 +3,6 @@ const utc = require('dayjs/plugin/utc')
 var timezone = require('dayjs/plugin/timezone')
 dayjs.extend(utc)
 dayjs.extend(timezone)
-const axios = require("axios");
-const {R} = require("redbean-node");
 const {BeanModel} = require("redbean-node/dist/bean-model");
 
 

server/model/monitor.js

@@ -49,8 +49,6 @@ class Monitor extends BeanModel {
         let retries = 0;
 
         const beat = async () => {
-            console.log(`Monitor ${this.id}: Heartbeat`)
-
             if (! previousBeat) {
                 previousBeat = await R.findOne("heartbeat", " monitor_id = ? ORDER BY time DESC", [
                     this.id
@@ -131,8 +129,6 @@ class Monitor extends BeanModel {
                         this.id
                     ])
 
-                    let promiseList = [];
-
                     let text;
                     if (bean.status === 1) {
                         text = "✅ Up"
@@ -143,16 +139,24 @@ class Monitor extends BeanModel {
                     let msg = `[${this.name}] [${text}] ${bean.msg}`;
 
                     for(let notification of notificationList) {
-                        promiseList.push(Notification.send(JSON.parse(notification.config), msg, await this.toJSON(), bean.toJSON()));
+                        try {
+                            await Notification.send(JSON.parse(notification.config), msg, await this.toJSON(), bean.toJSON())
+                        } catch (e) {
+                            console.error("Cannot send notification to " + notification.name)
+                        }
                     }
-
-                    await Promise.all(promiseList);
                 }
 
             } else {
                 bean.important = false;
             }
 
+            if (bean.status === 1) {
+                console.info(`Monitor #${this.id} '${this.name}': Successful Response: ${bean.ping} ms | Interval: ${this.interval} seconds | Type: ${this.type}`)
+            } else {
+                console.warn(`Monitor #${this.id} '${this.name}': Failing: ${bean.msg} | Type: ${this.type}`)
+            }
+
             io.to(this.user_id).emit("heartbeat", bean.toJSON());
 
             await R.store(bean)