fix: fixed error reporting so catch node could be used

Closes #119
zachowj · May 22, 2019 · 861c8e8 · 861c8e8
1 parent 6a3376b
commit 861c8e8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/nodes/call-service/call-service.js b/nodes/call-service/call-service.js
@@ -84,7 +84,8 @@ module.exports = function(RED) {
                 this.error(
                     `call service node is missing api "${
                         !apiDomain ? 'domain' : 'service'
-                    }" property, not found in config or payload`
+                    }" property, not found in config or payload`,
+                    message
                 );
                 this.setStatusFailed('Error');
                 return;
@@ -121,7 +122,8 @@ module.exports = function(RED) {
                     this.error(
                         `Call-service API error.${
                             err.message ? ` Error Message: ${err.message}` : ''
-                        }`
+                        }`,
+                        message
                     );
 
                     this.setStatusFailed('API Error');

diff --git a/nodes/get-history/get-history.js b/nodes/get-history/get-history.js
@@ -127,16 +127,11 @@ module.exports = function(RED) {
                 message.enddate = enddate || null;
                 message.entityid = entityid || null;
             } catch (err) {
-                let errorMessage =
-                    'Error get-history, home assistant api error.';
-                if (this.utils.selectn('response.data.message', err))
-                    errorMessage = `${errorMessage} Error Message: ${
-                        err.response.data.message
-                    }`;
-                this.error(errorMessage);
+                let errorMessage = `Error get-history: ${err.message}`;
+                this.error(errorMessage, message);
                 this.setStatusFailed('Error');
 
-                return null;
+                return;
             }
 
             if (this.nodeConfig.output_location === undefined) {

diff --git a/nodes/render-template/render-template.js b/nodes/render-template/render-template.js
@@ -100,13 +100,7 @@ module.exports = function(RED) {
                     this.setStatusSuccess();
                 })
                 .catch(err => {
-                    this.error(
-                        `Error get-template, home assistant api error. ${
-                            this.utils.selectn('response.data.message', err)
-                                ? `Error Message: ${err.response.data.message}`
-                                : ''
-                        }`
-                    );
+                    this.error(`Error get-template: ${err.message}`, message);
                     this.setStatusFailed('Error');
                 });
         }

diff --git a/nodes/wait-until/wait-until.js b/nodes/wait-until/wait-until.js
@@ -78,7 +78,7 @@ module.exports = function(RED) {
 
                 this.send([this.savedMessage, null]);
             } catch (e) {
-                this.error(e);
+                this.error(e, this.savedMessage);
             }
         }