Skip to content

Commit 24545ec

Browse files
committed
fix(Tool): Restore logging
1 parent d14b989 commit 24545ec

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Propulsion/StreamFilter.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ type StreamFilter([<Optional>] allowCats, [<Optional>] denyCats, [<Optional>] al
77
[<Optional>] allowEts, [<Optional>] denyEts,
88
[<Optional; DefaultParameterValue(false)>] ?incIndexes,
99
[<Optional; DefaultParameterValue(null)>] ?log) =
10-
let log = defaultArg log Serilog.Log.Logger
10+
let log = lazy defaultArg log Serilog.Log.Logger
1111
let defA x = match x with null -> Array.empty | xs -> Seq.toArray xs
1212

1313
let allowCats, denyCats, incIndexes = defA allowCats, defA denyCats, defaultArg incIndexes false
@@ -35,8 +35,8 @@ type StreamFilter([<Optional>] allowCats, [<Optional>] denyCats, [<Optional>] al
3535
let denyCats = if incIndexes then denyCats else Array.append denyCats [| "^\$" |]
3636
let allowSns, denySns = match allowSns, denySns with [||], [||] -> [|".*"|], [||] | x -> x
3737
let allowEts, denyEts = match allowEts, denyEts with [||], [||] -> [|".*"|], [||] | x -> x
38-
log.Information("Categories ☑️ {@allowCats} 🚫{@denyCats} Streams ☑️ {@allowStreams} 🚫{denyStreams} Events ☑️ {allowEts} 🚫{@denyEts}",
39-
asRe allowCats, asRe denyCats, asRe allowSns, asRe denySns, asRe allowEts, asRe denyEts)
38+
log.Value.Information("Categories ☑️ {@allowCats} 🚫{@denyCats} Streams ☑️ {@allowStreams} 🚫{denyStreams} Events ☑️ {allowEts} 🚫{@denyEts}",
39+
asRe allowCats, asRe denyCats, asRe allowSns, asRe denySns, asRe allowEts, asRe denyEts)
4040
fun sn ->
4141
validCat sn
4242
&& validStream sn

tools/Propulsion.Tool/Sync.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ and Arguments(c, p: ParseResults<Parameters>) =
5959
| x -> p.Raise $"unexpected subcommand %A{x}"
6060
member val StatsInterval = TimeSpan.minutes 1
6161
member val StateInterval = TimeSpan.minutes 5
62-
member val IdleDelay = TimeSpan.ms 10.
6362
and [<NoEquality; NoComparison; RequireSubcommand>] SourceParameters =
6463
| [<CliPrefix(CliPrefix.None); Last; Unique>] Cosmos of ParseResults<Args.Cosmos.Parameters>
6564
| [<CliPrefix(CliPrefix.None); Last; Unique>] Dynamo of ParseResults<Args.Dynamo.Parameters>
@@ -189,6 +188,7 @@ type Stats(log, statsInterval, stateInterval, verboseStore, logExternalStats) =
189188
handled <- 0; ignored <- 0
190189
intervalLats.Dump(log, "EVENTS")
191190
intervalLats.Clear()
191+
base.DumpStats()
192192
override _.DumpState purge =
193193
accEventTypeLats.Dump(log, "ΣEVENTS")
194194
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 {
243243
let json = Propulsion.Codec.NewtonsoftJson.RenderedSpan.ofStreamSpan stream events |> Propulsion.Codec.NewtonsoftJson.Serdes.Serialize
244244
do! producer.ProduceAsync(FsCodec.StreamName.toString stream, json) |> Async.Ignore
245245
return Propulsion.Sinks.StreamResult.AllProcessed, Outcome.render_ stream ham spam 0 }
246-
Propulsion.Sinks.Factory.StartConcurrent(Log.Logger, maxReadAhead, maxConcurrentProcessors, handle a.Filters.EventFilter, stats, idleDelay = a.IdleDelay)
246+
Propulsion.Sinks.Factory.StartConcurrent(Log.Logger, maxReadAhead, maxConcurrentProcessors, handle a.Filters.EventFilter, stats)
247247
| SubCommand.Sync a ->
248248
let eventsContext = a.ConnectEvents() |> Async.RunSynchronously
249249
let stats = Propulsion.CosmosStore.CosmosStoreSinkStats(Log.Logger, statsInterval, stateInterval)

0 commit comments

Comments
 (0)