From 3e148372291c01e99c9315bab4a68afd8df34e1c Mon Sep 17 00:00:00 2001
From: Adam Driscoll <adamdriscoll@users.noreply.github.com>
Date: Fri, 29 Mar 2019 21:15:11 -0600
Subject: [PATCH] Fixes #480 (#711)

---
 .../package-lock.json                         | 41 ++++++++++++++-----
 .../Execution/ExecutionService.cs             |  4 +-
 2 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/src/UniversalDashboard.MaterialUI/package-lock.json b/src/UniversalDashboard.MaterialUI/package-lock.json
index 07d909ba..a29db717 100644
--- a/src/UniversalDashboard.MaterialUI/package-lock.json
+++ b/src/UniversalDashboard.MaterialUI/package-lock.json
@@ -3495,7 +3495,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -3516,12 +3517,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -3536,17 +3539,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -3663,7 +3669,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -3675,6 +3682,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -3689,6 +3697,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -3696,12 +3705,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -3720,6 +3731,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3800,7 +3812,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3812,6 +3825,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3897,7 +3911,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3933,6 +3948,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3952,6 +3968,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3995,12 +4012,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/src/UniversalDashboard/Execution/ExecutionService.cs b/src/UniversalDashboard/Execution/ExecutionService.cs
index 347ee36f..ee9348d7 100644
--- a/src/UniversalDashboard/Execution/ExecutionService.cs
+++ b/src/UniversalDashboard/Execution/ExecutionService.cs
@@ -136,7 +136,7 @@ public object ExecuteEndpoint(ExecutionContext context, Endpoint endpoint)
                                 var error = ps.Streams.Error[0].Exception.Message;
 
                                 foreach(var errorRecord in ps.Streams.Error) {
-                                    Log.Warn($"Error executing endpoint script. {errorRecord} {Environment.NewLine} {errorRecord.ScriptStackTrace}");
+                                    Log.Warn($"Error executing endpoint {endpoint.Name}. {errorRecord} {Environment.NewLine} {errorRecord.ScriptStackTrace}");
                                 }
 
                                 return new { Error = new Error { Message = error } };
@@ -145,7 +145,7 @@ public object ExecuteEndpoint(ExecutionContext context, Endpoint endpoint)
                     }
                     catch (Exception ex)
                     {
-                        Log.Warn(ex, "Error executing endpoint script.");
+                        Log.Warn(ex, $"Error executing endpoint {endpoint.Name}.");
 
                         return new { Error = new Error { Message = ex.Message, Location = ex.StackTrace } };
                     }