mirror of
https://github.com/codex-storage/nim-codex.git
synced 2025-01-18 17:02:26 +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
92 lines
2.3 KiB
Nim
92 lines
2.3 KiB
Nim
import std/osproc
|
|
import std/os
|
|
import std/streams
|
|
import std/strutils
|
|
import pkg/codex/conf
|
|
import pkg/codex/logutils
|
|
import pkg/confutils
|
|
import pkg/libp2p
|
|
import pkg/questionable
|
|
import ./codexclient
|
|
|
|
export codexclient
|
|
|
|
const workingDir = currentSourcePath() / ".." / ".." / ".."
|
|
const executable = "build" / "codex"
|
|
|
|
type
|
|
NodeProcess* = ref object
|
|
process: Process
|
|
arguments: seq[string]
|
|
debug: bool
|
|
client: ?CodexClient
|
|
|
|
proc start(node: NodeProcess) =
|
|
if node.debug:
|
|
node.process = osproc.startProcess(
|
|
executable,
|
|
workingDir,
|
|
node.arguments,
|
|
options={poParentStreams}
|
|
)
|
|
else:
|
|
node.process = osproc.startProcess(
|
|
executable,
|
|
workingDir,
|
|
node.arguments
|
|
)
|
|
|
|
proc waitUntilOutput*(node: NodeProcess, output: string) =
|
|
if node.debug:
|
|
raiseAssert "cannot read node output when in debug mode"
|
|
for line in node.process.outputStream.lines:
|
|
if line.contains(output):
|
|
return
|
|
raiseAssert "node did not output '" & output & "'"
|
|
|
|
proc waitUntilStarted*(node: NodeProcess) =
|
|
if node.debug:
|
|
sleep(5_000)
|
|
else:
|
|
node.waitUntilOutput("Started codex node")
|
|
|
|
proc startNode*(args: openArray[string], debug: string | bool = false): NodeProcess =
|
|
## Starts a Codex Node with the specified arguments.
|
|
## Set debug to 'true' to see output of the node.
|
|
let node = NodeProcess(arguments: @args, debug: ($debug != "false"))
|
|
node.start()
|
|
node
|
|
|
|
proc dataDir(node: NodeProcess): string =
|
|
let config = CodexConf.load(cmdLine = node.arguments)
|
|
config.dataDir.string
|
|
|
|
proc apiUrl(node: NodeProcess): string =
|
|
let config = CodexConf.load(cmdLine = node.arguments)
|
|
"http://" & config.apiBindAddress & ":" & $config.apiPort & "/api/codex/v1"
|
|
|
|
proc client*(node: NodeProcess): CodexClient =
|
|
if client =? node.client:
|
|
return client
|
|
let client = CodexClient.new(node.apiUrl)
|
|
node.client = some client
|
|
client
|
|
|
|
proc stop*(node: NodeProcess) =
|
|
if node.process != nil:
|
|
node.process.terminate()
|
|
discard node.process.waitForExit(timeout=5_000)
|
|
node.process.close()
|
|
node.process = nil
|
|
if client =? node.client:
|
|
node.client = none CodexClient
|
|
client.close()
|
|
|
|
proc restart*(node: NodeProcess) =
|
|
node.stop()
|
|
node.start()
|
|
node.waitUntilStarted()
|
|
|
|
proc removeDataDir*(node: NodeProcess) =
|
|
removeDir(node.dataDir)
|