Fixes getLoggerByFunc for computation expressions (#26)

Author: TheAngryByrd

src/FsLibLog/FsLibLog.fs

@@ -1014,6 +1014,7 @@ module Providers =
 
 #endif
 
+
 module LogProvider =
     open System
     open Types
@@ -1184,22 +1185,6 @@ module LogProvider =
     let getLoggerByQuotation (quotation: Quotations.Expr) =
         getModuleType quotation |> getLoggerByType
 
-    /// **Description**
-    ///
-    /// Creates a logger based on `Reflection.MethodBase.GetCurrentMethod` call.  This is only useful for calls within functions.  This does not protect against inlined functions.
-    ///
-    /// **Output Type**
-    ///   * `ILog`
-    ///
-    /// **Exceptions**
-    ///
-    let inline getLoggerByFunc () =
-        let mi = Reflection.MethodBase.GetCurrentMethod()
-
-        sprintf "%s.%s" mi.DeclaringType.FullName mi.Name
-        |> getLoggerByName
-
-
     /// **Description**
     ///
     /// Creates a logger. It's name is based on the current StackFrame. This will attempt to retrieve any loggers set with `setLoggerProvider`.  It will fallback to a known list of providers.
@@ -1211,4 +1196,21 @@ module LogProvider =
     let getCurrentLogger () =
         let stackFrame = StackFrame(2, false)
         getLoggerByType (stackFrame.GetMethod().DeclaringType)
+
+
+type LogProvider =
+    /// <summary>
+    /// Creates a logger based on `Reflection.MethodBase.GetCurrentMethod().FullName` and `CallerMemberName`. This is only useful for calls within functions. Results may vary on lambda and inlined functions.
+    /// </summary>
+    /// <param name="memberName">Do not pass anything to this parameter to get `CallerMemberName` to work.</param>
+    /// <returns></returns>
+    static member inline getLoggerByFunc([<System.Runtime.CompilerServices.CallerMemberName>] ?memberName: string) =
+        let mi = System.Reflection.MethodBase.GetCurrentMethod()
+        // When we're in a CE we get something like `WebBackend.App+thingsToCall2@130`.
+        // CallerMemberName gets us the function that actually called it
+        // Splitting off + seems like the best option to get the Fully Qualified Path
+        let location = mi.DeclaringType.FullName.Split('+') |> Seq.tryHead |> Option.defaultValue ""
+        sprintf "%s.%s" location memberName.Value
+        |> LogProvider.getLoggerByName
+
 #endif

tests/FsLibLog.Tests/Tests.fs

@@ -70,6 +70,10 @@ let private getNewProvider () =
 let someFunction () =
     let logger = LogProvider.getLoggerByFunc()
     ()
+let someAsyncFunction () = async {
+    let logger = LogProvider.getLoggerByFunc()
+    ()
+}
 #endif
 
 type Dog = {
@@ -88,6 +92,11 @@ let tests =
                 let provider = getNewProvider()
                 someFunction()
                 Expect.equal provider.LoggerName "Tests.someFunction" ""
+            testCaseAsync "LogProvider.getLoggerByFunc async CE" <| async {
+                let provider = getNewProvider()
+                do! someAsyncFunction()
+                Expect.equal provider.LoggerName "Tests.someAsyncFunction" ""
+            }
 
             testCase "LogProvider.getLoggerByQuotation" <| fun _ ->
                 Expect.equal SomeOtherModule.provider.LoggerName "Tests+SomeOtherModule" ""