mirror of
https://github.com/status-im/nim-dagger.git
synced 2025-01-09 22:25:51 +00:00
de88fd2c53
* implement a logging proxy The logging proxy: - prevents the need to import chronicles (as well as export except toJson), - prevents the need to override `writeValue` or use or import nim-json-seralization elsewhere in the codebase, allowing for sole use of utils/json for de/serialization, - and handles json formatting correctly in chronicles json sinks * Rename logging -> logutils to avoid ambiguity with common names * clean up * add setProperty for JsonRecord, remove nim-json-serialization conflict * Allow specifying textlines and json format separately Not specifying a LogFormat will apply the formatting to both textlines and json sinks. Specifying a LogFormat will apply the formatting to only that sink. * remove unneeded usages of std/json We only need to import utils/json instead of std/json * move serialization from rest/json to utils/json so it can be shared * fix NoColors ambiguity Was causing unit tests to fail on Windows. * Remove nre usage to fix Windows error Windows was erroring with `could not load: pcre64.dll`. Instead of fixing that error, remove the pcre usage :) * Add logutils module doc * Shorten logutils.formatIt for `NBytes` Both json and textlines formatIt were not needed, and could be combined into one formatIt * remove debug integration test config debug output and logformat of json for integration test logs * Use ## module doc to support docgen * bump nim-poseidon2 to export fromBytes Before the changes in this branch, fromBytes was likely being resolved by nim-stew, or other dependency. With the changes in this branch, that dependency was removed and fromBytes could no longer be resolved. By exporting fromBytes from nim-poseidon, the correct resolution is now happening. * fixes to get compiling after rebasing master * Add support for Result types being logged using formatIt
53 lines
1.3 KiB
Nim
53 lines
1.3 KiB
Nim
import std/sugar
|
|
import std/tables
|
|
import pkg/chronos
|
|
|
|
import ../logutils
|
|
import ../utils/then
|
|
|
|
type
|
|
TrackedFutures* = ref object
|
|
futures: Table[uint, FutureBase]
|
|
cancelling: bool
|
|
|
|
logScope:
|
|
topics = "trackable futures"
|
|
|
|
proc len*(self: TrackedFutures): int = self.futures.len
|
|
|
|
proc removeFuture(self: TrackedFutures, future: FutureBase) =
|
|
if not self.cancelling and not future.isNil:
|
|
self.futures.del(future.id)
|
|
|
|
proc track*[T](self: TrackedFutures, fut: Future[T]): Future[T] =
|
|
if self.cancelling:
|
|
return fut
|
|
|
|
self.futures[fut.id] = FutureBase(fut)
|
|
|
|
fut
|
|
.then((val: T) => self.removeFuture(fut))
|
|
.cancelled(() => self.removeFuture(fut))
|
|
.catch((e: ref CatchableError) => self.removeFuture(fut))
|
|
|
|
return fut
|
|
|
|
proc track*[T, U](future: Future[T], self: U): Future[T] =
|
|
## Convenience method that allows chaining future, eg:
|
|
## `await someFut().track(sales)`, where `sales` has declared a
|
|
## `trackedFutures` property.
|
|
self.trackedFutures.track(future)
|
|
|
|
proc cancelTracked*(self: TrackedFutures) {.async.} =
|
|
self.cancelling = true
|
|
|
|
trace "cancelling tracked futures"
|
|
|
|
for future in self.futures.values:
|
|
if not future.isNil and not future.finished:
|
|
trace "cancelling tracked future", id = future.id
|
|
await future.cancelAndWait()
|
|
|
|
self.futures.clear()
|
|
self.cancelling = false
|