2023-07-20 07:56:28 +00:00
|
|
|
import pkg/metrics
|
feat: create logging proxy (#663)
* 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
2024-01-23 07:35:03 +00:00
|
|
|
|
|
|
|
|
import ../../logutils
|
2022-09-27 14:27:40 +00:00
|
|
|
import ../statemachine
|
2023-06-05 08:48:06 +00:00
|
|
|
import ./errorhandling
|
2022-09-27 14:27:40 +00:00
|
|
|
|
2023-11-03 15:21:54 +00:00
|
|
|
declareCounter(codex_purchases_cancelled, "codex purchases cancelled")
|
2023-07-20 07:56:28 +00:00
|
|
|
|
2023-10-19 08:12:49 +00:00
|
|
|
logScope:
|
|
|
|
|
topics = "marketplace purchases cancelled"
|
|
|
|
|
|
2023-06-05 08:48:06 +00:00
|
|
|
type PurchaseCancelled* = ref object of ErrorHandlingState
|
2022-09-27 14:27:40 +00:00
|
|
|
|
2023-06-05 08:48:06 +00:00
|
|
|
method `$`*(state: PurchaseCancelled): string =
|
|
|
|
|
"cancelled"
|
2022-09-27 14:27:40 +00:00
|
|
|
|
2023-06-05 08:48:06 +00:00
|
|
|
method run*(state: PurchaseCancelled, machine: Machine): Future[?State] {.async.} =
|
2023-11-03 15:21:54 +00:00
|
|
|
codex_purchases_cancelled.inc()
|
2023-06-05 08:48:06 +00:00
|
|
|
let purchase = Purchase(machine)
|
2023-10-19 08:12:49 +00:00
|
|
|
|
feat: create logging proxy (#663)
* 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
2024-01-23 07:35:03 +00:00
|
|
|
warn "Request cancelled, withdrawing remaining funds", requestId = purchase.requestId
|
2023-06-05 08:48:06 +00:00
|
|
|
await purchase.market.withdrawFunds(purchase.requestId)
|
2023-10-19 08:12:49 +00:00
|
|
|
|
2022-09-27 14:27:40 +00:00
|
|
|
let error = newException(Timeout, "Purchase cancelled due to timeout")
|
2023-10-24 10:12:54 +00:00
|
|
|
purchase.future.fail(error)
|
