Update -Debug.

Author: peombwa

tools/Custom/Module.cs

@@ -56,19 +56,25 @@ partial void CustomInit()
         /// </returns>
         public async Task EventHandler(string id, CancellationToken cancellationToken, Func<EventArgs> getEventData, Func<string, CancellationToken, Func<EventArgs>, Task> signal, InvocationInfo invocationInfo, string parameterSetName, System.Exception exception)
         {
-            switch (id)
+            if (invocationInfo.BoundParameters.ContainsKey("Debug"))
             {
-                case Events.Finally:
-                    await Finally(id, cancellationToken, getEventData, signal);
-                    break;
-                default:
-                    getEventData.Print(signal, cancellationToken, Events.Information, id);
-                    break;
+                switch (id)
+                {
+                    case Events.BeforeCall:
+                        await BeforeCall(id, cancellationToken, getEventData, signal);
+                        break;
+                    case Events.Finally:
+                        await Finally(id, cancellationToken, getEventData, signal);
+                        break;
+                    default:
+                        getEventData.Print(signal, cancellationToken, Events.Information, id);
+                        break;
+                }
             }
         }
 
         /// <summary>
-        /// Handles the Finally event, which is called just before Request and Response are disposed.
+        /// Handles the Finally event, which is called just after a response is received.
         /// </summary>
         /// <param name="id">The ID of the event</param>
         /// <param name="cancellationToken">The cancellation token for the event</param>
@@ -82,15 +88,35 @@ private async Task Finally(string id, CancellationToken cancellationToken, Func<
             using (Extensions.NoSynchronizationContext)
             {
                 var eventData = EventDataConverter.ConvertFrom(getEventData());
-                using (var requestFormatter = new HttpMessageFormatter(eventData.RequestMessage as HttpRequestMessage))
                 using (var responseFormatter = new HttpMessageFormatter(eventData.ResponseMessage as HttpResponseMessage))
                 {
-                    var requestString = await requestFormatter.ReadAsStringAsync();
                     var responseString = await responseFormatter.ReadAsStringAsync();
-                    await signal(Events.Debug, cancellationToken, () => EventFactory.CreateLogEvent(requestString));
                     await signal(Events.Debug, cancellationToken, () => EventFactory.CreateLogEvent(responseString));
                 }
             }
         }
+
+        /// <summary>
+        /// Handles the BeforeCall event, which is called just before Request is sent.
+        /// </summary>
+        /// <param name="id">The ID of the event</param>
+        /// <param name="cancellationToken">The cancellation token for the event</param>
+        /// <param name="getEventData">A delegate to get the detailed event data</param>
+        /// <param name="signal">The callback for the event dispatcher</param>
+        /// <returns>
+        /// A <see cref="global::System.Threading.Tasks.Task" /> that will be complete when handling of the event is completed.
+        /// </returns>
+        private async Task BeforeCall(string id, CancellationToken cancellationToken, Func<EventArgs> getEventData, Func<string, CancellationToken, Func<EventArgs>, Task> signal)
+        {
+            using (Extensions.NoSynchronizationContext)
+            {
+                var eventData = EventDataConverter.ConvertFrom(getEventData());
+                using (var requestFormatter = new HttpMessageFormatter(eventData.RequestMessage as HttpRequestMessage))
+                {
+                    var requestString = await requestFormatter.ReadAsStringAsync();
+                    await signal(Events.Debug, cancellationToken, () => EventFactory.CreateLogEvent(requestString));
+                }
+            }
+        }
     }
 }