[logging] completing Logary Facade introduction

logibit · Aug 7, 2016 · bc42c73 · bc42c73
1 parent 8e0d31a
commit bc42c73
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 22 deletions.
diff --git a/src/Logibit.Hawk.Suave.Tests/Hawk.fs b/src/Logibit.Hawk.Suave.Tests/Hawk.fs
@@ -5,6 +5,7 @@ open System.Net
 open System.Net.Http
 open System.Net.Http.Headers
 open Fuchu
+open NodaTime
 open Suave
 open Suave.Web
 open Suave.Filters
@@ -16,8 +17,6 @@ type HM = HttpMethod
 open Logibit.Hawk
 open Logibit.Hawk.Server
 open Logibit.Hawk.Client
-open NodaTime
-open Fuchu
 open Suave.Http
 
 module Helpers =
@@ -84,7 +83,7 @@ let serverClientAuthentication =
         )
 
       yield testCase "signing GET request" <| fun _ ->
-        let opts = ClientOptions.mkSimple (credsInner "1")
+        let opts = ClientOptions.createSimple (credsInner "1")
         let request = setAuthHeader HM.GET opts
 
         runWithDefaultConfig hawkAuthenticate |> req HttpMethod.GET None request (fun resp ->
@@ -97,7 +96,7 @@ let serverClientAuthentication =
 
       yield testCase "signing POST request" <| fun _ ->
         let opts =
-          { ClientOptions.mkSimple (credsInner "1")
+          { ClientOptions.createSimple (credsInner "1")
               with payload = Some [| 0uy; 1uy |] }
 
         let request =
@@ -116,7 +115,7 @@ let serverClientAuthentication =
         Hawk.authenticate proxySettings Hawk.bindHeaderReq unauthed authed
 
       yield testCase "signing POST request" <| fun _ ->
-        let opts = { ClientOptions.mkSimple (credsInner "1") with payload = Some [| 0uy; 1uy |] }
+        let opts = { ClientOptions.createSimple (credsInner "1") with payload = Some [| 0uy; 1uy |] }
 
         let request =
           setAuthHeader HM.POST opts
@@ -170,7 +169,7 @@ let bewitServerClientAuth =
             localClockOffset = Duration.Zero
             clock            = clock
             ext              = None
-            logger           = Logging.NoopLogger }
+            logger           = Logging.Targets.create Logging.Warn }
 
         let requestf =
           setBewitQuery opts
@@ -193,7 +192,7 @@ let bewitServerClientAuth =
             localClockOffset = Duration.Zero
             clock            = clock
             ext              = None
-            logger           = Logging.NoopLogger }
+            logger           = Logging.Targets.create Logging.Warn }
 
         let requestf =
           setBewitQuery opts

diff --git a/src/Logibit.Hawk.Tests/Bewit.fs b/src/Logibit.Hawk.Tests/Bewit.fs
@@ -5,13 +5,11 @@ open System.Net
 open System.Diagnostics
 open Fuchu
 open NodaTime
-
 open Logibit.Hawk
 open Logibit.Hawk.Bewit
 open Logibit.Hawk.Encoding
 open Logibit.Hawk.Logging
 open Logibit.Hawk.Types
-
 open Logibit.Hawk.Tests.Shared
 
 let ts i = Instant.FromTicksSinceUnixEpoch(i * NodaConstants.TicksPerMillisecond)
@@ -21,12 +19,13 @@ let clock =
 
 type DebugPrinter (name : string) =
   interface Logger with
-    member x.Verbose fLine =
-      Debug.WriteLine (sprintf "%s: %A" name (fLine ()))
-    member x.Debug fLine =
-      Debug.WriteLine (sprintf "%s: %A" name (fLine ()))
-    member x.Log line =
-      Debug.WriteLine (sprintf "%s: %A" name line)
+    member x.logSimple msg =
+      Debug.WriteLine (sprintf "%s: %A" name msg)
+    member x.log level msg =
+      Debug.WriteLine (sprintf "%s: %A" name msg)
+    member x.logWithAck level msgFactory =
+      Debug.WriteLine (sprintf "%s: %A" name (msgFactory level))
+      async.Return ()
 
 let credsInner =
   { id        = "123456"
@@ -47,7 +46,7 @@ let ``bewit generation`` =
             clock                    = clock
             localClockOffset         = ts 1356420407232L - clock.Now
             ext                      = Some "xandyandz"
-            logger                   = Logging.NoopLogger }
+            logger                   = Logging.Targets.create Logging.Warn }
       Assert.Equal("bewit should generate correctly",
                    "MTIzNDU2XDEzNTY0MjA3MDdca3NjeHdOUjJ0SnBQMVQxekRMTlBiQjVVaUtJVTl0T1NKWFRVZEc3WDloOD1ceGFuZHlhbmR6",
                    b)
@@ -61,7 +60,7 @@ let ``bewit generation`` =
             clock                    = clock
             localClockOffset         = ts 1356420407232L - clock.Now
             ext                      = Some "xandyandz"
-            logger                   = Logging.NoopLogger }
+            logger                   = Logging.Targets.create Logging.Warn }
       Assert.Equal("bewit should generate correctly",
                    "MTIzNDU2XDEzNTY0MjA3MDdcaFpiSjNQMmNLRW80a3kwQzhqa1pBa1J5Q1p1ZWc0V1NOYnhWN3ZxM3hIVT1ceGFuZHlhbmR6",
                    b)
@@ -75,7 +74,7 @@ let ``bewit generation`` =
             clock                    = clock
             localClockOffset         = ts 1356420407232L - clock.Now
             ext                      = None
-            logger                   = Logging.NoopLogger }
+            logger                   = Logging.Targets.create Logging.Warn }
       Assert.Equal("bewit should generate correctly",
                    "MTIzNDU2XDEzNTY0MjA3MDdcSUdZbUxnSXFMckNlOEN4dktQczRKbFdJQStValdKSm91d2dBUmlWaENBZz1c",
                    b)
@@ -124,7 +123,7 @@ let ``parsing bewit parts`` =
                         clock                    = clock
                         localClockOffset         = ts 1356420407232L - clock.Now
                         ext                      = None
-                        logger                   = Logging.NoopLogger }
+                        logger                   = Logging.Targets.create Logging.Warn }
     match Bewit.parse b with
     | Choice1Of2 map ->
       Assert.Equal("has id", credsInner.id, map |> Map.find "id")
@@ -136,7 +135,7 @@ let ``parsing bewit parts`` =
 
 let settings =
   { Settings.clock   = clock
-    logger           = Logging.NoopLogger
+    logger           = Targets.create Warn
     allowedClockSkew = Duration.FromMilliseconds 300L
     localClockOffset = ts 1356420407232L - clock.Now
     nonceValidator   = Settings.nonceValidatorMem
@@ -155,7 +154,7 @@ let authentication =
       clock                    = clock
       localClockOffset         = ts 1356420407232L - clock.Now
       ext                      = Some "some-app-data"
-      logger                   = Logging.NoopLogger }
+      logger                   = Targets.create Warn }
 
   let bewitRequest fInspect =
     uriBuilder.Query <- uriParams

diff --git a/src/Logibit.Hawk.Tests/Server.fs b/src/Logibit.Hawk.Tests/Server.fs
@@ -69,7 +69,7 @@ let server =
 
   let settings =
     { clock            = clock
-      logger           = Logging.NoopLogger
+      logger           = Logging.Targets.create Logging.Warn
       allowedClockSkew = Duration.FromMilliseconds 8000L
       localClockOffset = Duration.Zero
       nonceValidator   = Settings.nonceValidatorNoop