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

use RpcSettings and RpcSettingsOpt

Browse Source
This commit is contained in:
darkfi
2025-02-18 22:35:41 +01:00
committed by skoupidi
parent a220243e56
commit 2bbe39e0ee
76 changed files with 585 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
example/dchat/dchatd/dchatd_config.toml
View File

@@ -1,7 +1,12 @@
# dchat toml
## RPC listen address.
rpc_listen="tcp://127.0.0.1:51054"
# JSON-RPC settings
[rpc]
# JSON-RPC listen URL
rpc_listen = "tcp://127.0.0.1:51054"
# Disabled RPC methods
rpc_disabled_methods = ["p2p.get_info"]
[net]
## P2P accept addresses Required for inbound nodes.

12
example/dchat/dchatd/src/main.rs
View File

@@ -20,7 +20,6 @@
use log::{debug, error, info};
use smol::{lock::Mutex, stream::StreamExt};
use std::{collections::HashSet, sync::Arc};
use url::Url;
use darkfi::{
async_daemonize, cli_desc, net,
@@ -28,6 +27,7 @@ use darkfi::{
rpc::{
jsonrpc::JsonSubscriber,
server::{listen_and_serve, RequestHandler},
settings::{RpcSettings, RpcSettingsOpt},
},
system::{StoppableTask, StoppableTaskPtr},
Error, Result,
@@ -54,9 +54,8 @@ const CONFIG_FILE_CONTENTS: &str = include_str!("../dchatd_config.toml");
#[serde(default)]
#[structopt(name = "dchat", about = cli_desc!())]
struct Args {
#[structopt(long, default_value = "tcp://127.0.0.1:51054")]
/// RPC server listen address
rpc_listen: Url,
#[structopt(flatten)]
pub rpc: RpcSettingsOpt,
#[structopt(short, long)]
/// Configuration file to use
@@ -128,7 +127,8 @@ async fn realmain(args: Args, ex: Arc<smol::Executor<'static>>) -> Result<()> {
// ANCHOR_end: dnet
// ANCHOR: rpc
info!("Starting JSON-RPC server on port {}", args.rpc_listen);
let rpc_settings: RpcSettings = args.rpc.into();
info!("Starting JSON-RPC server on port {}", rpc_settings.listen);
let msgs: DchatMsgsBuffer = Arc::new(Mutex::new(vec![DchatMsg { msg: String::new() }]));
let rpc_connections = Mutex::new(HashSet::new());
let dchat = Arc::new(Dchat::new(p2p.clone(), msgs.clone(), rpc_connections, dnet_sub));
@@ -136,7 +136,7 @@ async fn realmain(args: Args, ex: Arc<smol::Executor<'static>>) -> Result<()> {
let rpc_task = StoppableTask::new();
rpc_task.clone().start(
listen_and_serve(args.rpc_listen, dchat.clone(), None, ex.clone()),
listen_and_serve(rpc_settings, dchat.clone(), None, ex.clone()),
|res| async move {
match res {
Ok(()) | Err(Error::RpcServerStopped) => dchat.stop_connections().await,