Merge 9d0d5bfbd6 into 03beef8006

Co-authored-by: Frank Elsinga <frank@elsinga.de>

server/model/monitor.js

@@ -1434,7 +1434,7 @@ class Monitor extends BeanModel {
         for (let notification of notificationList) {
             try {
                 log.debug("monitor", "Sending to " + notification.name);
-                await Notification.send(JSON.parse(notification.config), `[${this.name}][${this.url}] ${certType} certificate ${certCN} will be expired in ${daysRemaining} days`);
+                await Notification.send(JSON.parse(notification.config), `[${this.name}](${this.url}) ${certType} certificate ${certCN} will be expired in ${daysRemaining} days`);
                 sent = true;
             } catch (e) {
                 log.error("monitor", "Cannot send cert notification to " + notification.name);

server/modules/apicache/apicache.js

@@ -485,7 +485,7 @@ function ApiCache() {
         }
 
         if (typeof duration === "string") {
-            let split = duration.match(/^([\d\.,]+)\s?(\w+)$/);
+            let split = duration.match(/^([\d\.,]+)\s?([a-zA-Z]+)$/);
 
             if (split.length === 3) {
                 let len = parseFloat(split[1]);