fix(Tool): Restore logging

jet · Feb 27, 2024 · 24545ec · 24545ec
1 parent d14b989
commit 24545ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/Propulsion/StreamFilter.fs b/src/Propulsion/StreamFilter.fs
@@ -7,7 +7,7 @@ type StreamFilter([<Optional>] allowCats, [<Optional>] denyCats, [<Optional>] al
                   [<Optional>] allowEts, [<Optional>] denyEts,
                   [<Optional; DefaultParameterValue(false)>] ?incIndexes,
                   [<Optional; DefaultParameterValue(null)>] ?log) =
-    let log = defaultArg log Serilog.Log.Logger
+    let log = lazy defaultArg log Serilog.Log.Logger
     let defA x = match x with null -> Array.empty | xs -> Seq.toArray xs
 
     let allowCats, denyCats, incIndexes = defA allowCats, defA denyCats, defaultArg incIndexes false
@@ -35,8 +35,8 @@ type StreamFilter([<Optional>] allowCats, [<Optional>] denyCats, [<Optional>] al
         let denyCats = if incIndexes then denyCats else Array.append denyCats [| "^\$" |]
         let allowSns, denySns = match allowSns, denySns with [||], [||] -> [|".*"|], [||] | x -> x
         let allowEts, denyEts = match allowEts, denyEts with [||], [||] -> [|".*"|], [||] | x -> x
-        log.Information("Categories ☑️ {@allowCats} 🚫{@denyCats} Streams ☑️ {@allowStreams} 🚫{denyStreams} Events ☑️ {allowEts} 🚫{@denyEts}",
-                        asRe allowCats, asRe denyCats, asRe allowSns, asRe denySns, asRe allowEts, asRe denyEts)
+        log.Value.Information("Categories ☑️ {@allowCats} 🚫{@denyCats} Streams ☑️ {@allowStreams} 🚫{denyStreams} Events ☑️ {allowEts} 🚫{@denyEts}",
+                              asRe allowCats, asRe denyCats, asRe allowSns, asRe denySns, asRe allowEts, asRe denyEts)
         fun sn ->
             validCat sn
             && validStream sn

diff --git a/tools/Propulsion.Tool/Sync.fs b/tools/Propulsion.Tool/Sync.fs
@@ -59,7 +59,6 @@ and Arguments(c, p: ParseResults<Parameters>) =
         | x ->                              p.Raise $"unexpected subcommand %A{x}"
     member val StatsInterval =              TimeSpan.minutes 1
     member val StateInterval =              TimeSpan.minutes 5
-    member val IdleDelay =                  TimeSpan.ms 10.
 and [<NoEquality; NoComparison; RequireSubcommand>] SourceParameters =
     | [<CliPrefix(CliPrefix.None); Last; Unique>] Cosmos of ParseResults<Args.Cosmos.Parameters>
     | [<CliPrefix(CliPrefix.None); Last; Unique>] Dynamo of ParseResults<Args.Dynamo.Parameters>
@@ -189,6 +188,7 @@ type Stats(log, statsInterval, stateInterval, verboseStore, logExternalStats) =
             handled <- 0; ignored <- 0
             intervalLats.Dump(log, "EVENTS")
             intervalLats.Clear()
+        base.DumpStats()
     override _.DumpState purge =
         accEventTypeLats.Dump(log, "ΣEVENTS")
         for cat in Seq.append accHam.Categories accSpam.Categories |> Seq.distinct |> Seq.sort do
@@ -243,7 +243,7 @@ let run appName (c: Args.Configuration, p: ParseResults<Parameters>) = async {
                     let json = Propulsion.Codec.NewtonsoftJson.RenderedSpan.ofStreamSpan stream events |> Propulsion.Codec.NewtonsoftJson.Serdes.Serialize
                     do! producer.ProduceAsync(FsCodec.StreamName.toString stream, json) |> Async.Ignore
                 return Propulsion.Sinks.StreamResult.AllProcessed, Outcome.render_ stream ham spam 0 }
-            Propulsion.Sinks.Factory.StartConcurrent(Log.Logger, maxReadAhead, maxConcurrentProcessors, handle a.Filters.EventFilter, stats, idleDelay = a.IdleDelay)
+            Propulsion.Sinks.Factory.StartConcurrent(Log.Logger, maxReadAhead, maxConcurrentProcessors, handle a.Filters.EventFilter, stats)
         | SubCommand.Sync a ->
             let eventsContext = a.ConnectEvents() |> Async.RunSynchronously
             let stats = Propulsion.CosmosStore.CosmosStoreSinkStats(Log.Logger, statsInterval, stateInterval)