Skip to content

Commit

Permalink
chore(logging): purchases logging (#567)
Browse files Browse the repository at this point in the history
  • Loading branch information
AuHau authored Oct 19, 2023
1 parent 5b30bfd commit c28627d
Show file tree
Hide file tree
Showing 18 changed files with 44 additions and 13 deletions.
2 changes: 1 addition & 1 deletion codex/contracts/market.nim
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import ./marketplace
export market

logScope:
topics = "marketplace onchain market"
topics = "marketplace onchain market"

type
OnChainMarket* = ref object of Market
Expand Down
7 changes: 7 additions & 0 deletions codex/purchasing/states/cancelled.nim
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
import pkg/metrics
import pkg/chronicles
import ../statemachine
import ./errorhandling
import ./error

declareCounter(codexPurchasesCancelled, "codex purchases cancelled")

logScope:
topics = "marketplace purchases cancelled"

type PurchaseCancelled* = ref object of ErrorHandlingState

method `$`*(state: PurchaseCancelled): string =
Expand All @@ -13,6 +17,9 @@ method `$`*(state: PurchaseCancelled): string =
method run*(state: PurchaseCancelled, machine: Machine): Future[?State] {.async.} =
codexPurchasesCancelled.inc()
let purchase = Purchase(machine)

warn "Request cancelled, withdrawing remaining funds", requestId = $purchase.requestId
await purchase.market.withdrawFunds(purchase.requestId)

let error = newException(Timeout, "Purchase cancelled due to timeout")
return some State(PurchaseErrored(error: error))
8 changes: 8 additions & 0 deletions codex/purchasing/states/error.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import pkg/metrics
import pkg/chronicles
import ../statemachine
import ../../utils/exceptions

declareCounter(codexPurchasesError, "codex purchases error")

logScope:
topics = "marketplace purchases errored"

type PurchaseErrored* = ref object of PurchaseState
error*: ref CatchableError

Expand All @@ -12,4 +17,7 @@ method `$`*(state: PurchaseErrored): string =
method run*(state: PurchaseErrored, machine: Machine): Future[?State] {.async.} =
codexPurchasesError.inc()
let purchase = Purchase(machine)

error "Purchasing error", error=state.error.msgDetail, requestId = purchase.requestId

purchase.future.fail(state.error)
5 changes: 5 additions & 0 deletions codex/purchasing/states/finished.nim
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import pkg/metrics
import pkg/chronicles
import ../statemachine

declareCounter(codexPurchasesFinished, "codex purchases finished")

logScope:
topics = "marketplace purchases finished"

type PurchaseFinished* = ref object of PurchaseState

method `$`*(state: PurchaseFinished): string =
Expand All @@ -11,4 +15,5 @@ method `$`*(state: PurchaseFinished): string =
method run*(state: PurchaseFinished, machine: Machine): Future[?State] {.async.} =
codexPurchasesFinished.inc()
let purchase = Purchase(machine)
info "Purchase finished", requestId = purchase.requestId
purchase.future.complete()
5 changes: 5 additions & 0 deletions codex/purchasing/states/started.nim
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import pkg/metrics
import pkg/chronicles
import ../statemachine
import ./errorhandling
import ./finished
import ./failed

declareCounter(codexPurchasesStarted, "codex purchases started")

logScope:
topics = "marketplace purchases started"

type PurchaseStarted* = ref object of ErrorHandlingState

method `$`*(state: PurchaseStarted): string =
Expand All @@ -17,6 +21,7 @@ method run*(state: PurchaseStarted, machine: Machine): Future[?State] {.async.}

let clock = purchase.clock
let market = purchase.market
info "All required slots filled, purchase started", requestId = purchase.requestId

let failed = newFuture[void]()
proc callback(_: RequestId) =
Expand Down
6 changes: 6 additions & 0 deletions codex/purchasing/states/submitted.nim
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
import pkg/metrics
import pkg/chronicles
import ../statemachine
import ./errorhandling
import ./started
import ./cancelled

logScope:
topics = "marketplace purchases submitted"

declareCounter(codexPurchasesSubmitted, "codex purchases submitted")

type PurchaseSubmitted* = ref object of ErrorHandlingState
Expand All @@ -18,6 +22,8 @@ method run*(state: PurchaseSubmitted, machine: Machine): Future[?State] {.async.
let market = purchase.market
let clock = purchase.clock

info "Request submitted, waiting for slots to be filled", requestId = purchase.requestId

proc wait {.async.} =
let done = newFuture[void]()
proc callback(_: RequestId) =
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/cancelled.nim
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ./errorhandling
import ./errored

logScope:
topics = "marketplace sales cancelled"
topics = "marketplace sales cancelled"

type
SaleCancelled* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/errored.nim
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ../salesagent
import ../../utils/exceptions

logScope:
topics = "marketplace sales errored"
topics = "marketplace sales errored"

type SaleErrored* = ref object of SaleState
error*: ref CatchableError
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/failed.nim
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import ./errorhandling
import ./errored

logScope:
topics = "marketplace sales failed"
topics = "marketplace sales failed"

type
SaleFailed* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/filled.nim
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ./proving
import ./provingsimulated

logScope:
topics = "marketplace sales filled"
topics = "marketplace sales filled"

type
SaleFilled* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/filling.nim
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ./cancelled
import ./failed

logScope:
topics = "marketplace sales filling"
topics = "marketplace sales filling"

type
SaleFilling* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/finished.nim
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ./cancelled
import ./failed

logScope:
topics = "marketplace sales finished"
topics = "marketplace sales finished"

type
SaleFinished* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/ignored.nim
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ../salesagent
import ./errorhandling

logScope:
topics = "marketplace sales ignored"
topics = "marketplace sales ignored"

type
SaleIgnored* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/initialproving.nim
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import ./cancelled
import ./failed

logScope:
topics = "marketplace sales initial-proving"
topics = "marketplace sales initial-proving"

type
SaleInitialProving* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/payout.nim
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ./failed
import ./finished

logScope:
topics = "marketplace sales payout"
topics = "marketplace sales payout"

type
SalePayout* = ref object of ErrorHandlingState
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/preparing.nim
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ type
SalePreparing* = ref object of ErrorHandlingState

logScope:
topics = "marketplace sales preparing"
topics = "marketplace sales preparing"

method `$`*(state: SalePreparing): string = "SalePreparing"

Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/proving.nim
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ./errored
import ./payout

logScope:
topics = "marketplace sales proving"
topics = "marketplace sales proving"

type
SlotNotFilledError* = object of CatchableError
Expand Down
2 changes: 1 addition & 1 deletion codex/sales/states/unknown.nim
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ./cancelled
import ./payout

logScope:
topics = "marketplace sales unknown"
topics = "marketplace sales unknown"

type
SaleUnknown* = ref object of SaleState
Expand Down

0 comments on commit c28627d

Please sign in to comment.