github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

example/p2pdebug: update log config

Browse Source
This commit is contained in:
ghassmo
2022-06-01 00:52:09 +03:00
parent 8f472cdad8
commit 1b6ef956fe
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
example/p2pdebug/src/main.rs
View File

@@ -7,7 +7,12 @@ use rand::{rngs::OsRng, Rng, RngCore};
use simplelog::{ColorChoice, TermLogger, TerminalMode};
use url::Url;
use darkfi::{cli_desc, net, rpc::rpcserver::listen_and_serve, util::cli::log_config, Result};
use darkfi::{
cli_desc, net,
rpc::server::listen_and_serve,
util::cli::{get_log_config, get_log_level},
Result,
};
pub(crate) mod proto;
pub(crate) mod rpc;
@@ -246,8 +251,9 @@ async fn start(executor: Arc<Executor<'_>>, args: Args) -> Result<()> {
fn main() -> Result<()> {
let args = Args::parse();
let (lvl, conf) = log_config(args.verbose.into())?;
TermLogger::init(lvl, conf, TerminalMode::Mixed, ColorChoice::Auto)?;
let log_level = get_log_level(args.verbose.into());
let log_config = get_log_config();
TermLogger::init(log_level, log_config, TerminalMode::Mixed, ColorChoice::Auto)?;
let ex = Arc::new(Executor::new());
let ex_clone = ex.clone();

13
example/p2pdebug/src/rpc.rs
View File

@@ -6,9 +6,8 @@ use url::Url;
use darkfi::{
net,
rpc::{
jsonrpc,
jsonrpc::{ErrorCode, JsonRequest, JsonResult},
rpcserver::RequestHandler,
jsonrpc::{ErrorCode, JsonError, JsonRequest, JsonResponse, JsonResult},
server::RequestHandler,
},
};
@@ -21,7 +20,7 @@ pub struct JsonRpcInterface {
impl RequestHandler for JsonRpcInterface {
async fn handle_request(&self, req: JsonRequest) -> JsonResult {
if req.params.as_array().is_none() {
return jsonrpc::error(ErrorCode::InvalidRequest, None, req.id).into()
return JsonError::new(ErrorCode::InvalidRequest, None, req.id).into()
}
debug!(target: "RPC", "--> {}", serde_json::to_string(&req).unwrap());
@@ -29,7 +28,7 @@ impl RequestHandler for JsonRpcInterface {
match req.method.as_str() {
Some("ping") => self.pong(req.id, req.params).await,
Some("get_info") => self.get_info(req.id, req.params).await,
Some(_) | None => jsonrpc::error(ErrorCode::MethodNotFound, None, req.id).into(),
Some(_) | None => JsonError::new(ErrorCode::MethodNotFound, None, req.id).into(),
}
}
}
@@ -40,7 +39,7 @@ impl JsonRpcInterface {
// --> {"jsonrpc": "2.0", "method": "ping", "params": [], "id": 42}
// <-- {"jsonrpc": "2.0", "result": "pong", "id": 42}
async fn pong(&self, id: Value, _params: Value) -> JsonResult {
jsonrpc::response(json!("pong"), id).into()
JsonResponse::new(json!("pong"), id).into()
}
// RPCAPI:
@@ -49,6 +48,6 @@ impl JsonRpcInterface {
// <-- {"jsonrpc": "2.0", result": {"nodeID": [], "nodeinfo": [], "id": 42}
async fn get_info(&self, id: Value, _params: Value) -> JsonResult {
let resp = self.p2p.get_info().await;
jsonrpc::response(resp, id).into()
JsonResponse::new(resp, id).into()
}
}