Added additional logging

Author: david-driscoll

src/JsonRpc/InputHandler.cs

@@ -167,9 +167,20 @@ private void HandleRequest(string request)
                     _scheduler.Add(
                         type,
                         item.Request.Method,
-                        async () => {
-                            var result = await _requestRouter.RouteRequest(item.Request);
-                            _outputHandler.Send(result.Value);
+                        async () =>
+                        {
+                            try
+                            {
+                                var result = await _requestRouter.RouteRequest(item.Request);
+                                _outputHandler.Send(result.Value);
+                            }
+                            catch (Exception e)
+                            {
+                                _logger.LogCritical(Events.UnhandledRequest, e, "Unhandled exception executing request {Method}@{Id}", item.Request.Method, item.Request.Id);
+                                // TODO: Should we rethrow or swallow?
+                                // If an exception happens... the whole system could be in a bad state, hence this throwing currently.
+                                throw;
+                            }
                         }
                     );
                 }
@@ -178,8 +189,19 @@ private void HandleRequest(string request)
                     _scheduler.Add(
                         type,
                         item.Notification.Method,
-                        () => {
-                            _requestRouter.RouteNotification(item.Notification);
+                        () =>
+                        {
+                            try
+                            {
+                                _requestRouter.RouteNotification(item.Notification);
+                            }
+                            catch (Exception e)
+                            {
+                                _logger.LogCritical(Events.UnhandledNotification, e, "Unhandled exception executing notification {Method}@{Id}", item.Notification.Method);
+                                // TODO: Should we rethrow or swallow?
+                                // If an exception happens... the whole system could be in a bad state, hence this throwing currently.
+                                throw;
+                            }
                             return Task.CompletedTask;
                         }
                     );

src/JsonRpc/ProcessScheduler.cs

@@ -95,16 +95,16 @@ private void ProcessRequestQueue()
                         }
                         catch (Exception e)
                         {
-                            // TODO: Create proper event ids
-                            _logger.LogCritical(Events.UnhandledRequest, e, "Unhandled exception executing request {Name}", name);
+                            // TODO: Should we rethrow or swallow?
+                            // If an exception happens... the whole system could be in a bad state, hence this throwing currently.
+                            _logger.LogCritical(Events.UnhandledException, e, "Unhandled exception executing request {Name}", name);
+                            throw;
                         }
                     }
                 }
             }
-            catch (OperationCanceledException ex)
+            catch (OperationCanceledException ex) when (ex.CancellationToken == token)
             {
-                if (ex.CancellationToken != token)
-                    throw;
                 // OperationCanceledException - The CancellationToken has been canceled.
                 Task.WaitAll(waitables.ToArray(), TimeSpan.FromMilliseconds(1000));
                 var keeponrunning = RemoveCompleteTasks(waitables);
@@ -130,6 +130,8 @@ public void Dispose()
 
     static class Events
     {
-        public static EventId UnhandledRequest = new EventId(1337_100);
+        public static EventId UnhandledException = new EventId(1337_100);
+        public static EventId UnhandledRequest = new EventId(1337_101);
+        public static EventId UnhandledNotification = new EventId(1337_102);
     }
 }