transatoshi/grin-explorer
1
0
Fork 0
mirror of https://github.com/transatoshi-mw/grin-explorer.git synced 2025-10-21 13:33:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix chain dir detection

Browse Source
This commit is contained in:
aglkm
2024-10-01 14:18:23 +03:00
parent 2fa9e29a03
commit 02d6fb7270
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/data.rs
View File

@@ -17,6 +17,7 @@ pub const OUTPUT_SIZE: u64 = 674 + 33 + 1;
#[derive(Debug)] #[derive(Debug)]
pub struct Dashboard { pub struct Dashboard {
// status // status
pub chain: String,
pub height: String, pub height: String,
pub sync: String, pub sync: String,
pub node_ver: String, pub node_ver: String,
@@ -56,6 +57,7 @@ pub struct Dashboard {
impl Dashboard { impl Dashboard {
pub fn new() -> Dashboard { pub fn new() -> Dashboard {
Dashboard { Dashboard {
chain: String::new(),
height: String::new(), height: String::new(),
sync: String::new(), sync: String::new(),
node_ver: String::new(), node_ver: String::new(),

9
src/requests.rs
View File

@@ -162,6 +162,7 @@ pub async fn get_status(dashboard: Arc<Mutex<Dashboard>>) -> Result<(), anyhow::
data.kernel_mmr_size = resp2["result"]["Ok"]["header"]["kernel_mmr_size"].to_string(); data.kernel_mmr_size = resp2["result"]["Ok"]["header"]["kernel_mmr_size"].to_string();
} }
data.chain = resp1["result"]["Ok"]["chain"].to_string();
data.height = resp1["result"]["Ok"]["tip"]["height"].to_string(); data.height = resp1["result"]["Ok"]["tip"]["height"].to_string();
data.sync = resp1["result"]["Ok"]["sync_status"].as_str().unwrap().to_string(); data.sync = resp1["result"]["Ok"]["sync_status"].as_str().unwrap().to_string();
data.node_ver = resp1["result"]["Ok"]["user_agent"].as_str().unwrap().to_string(); data.node_ver = resp1["result"]["Ok"]["user_agent"].as_str().unwrap().to_string();
@@ -305,10 +306,14 @@ pub fn get_disk_usage(dashboard: Arc<Mutex<Dashboard>>) -> Result<(), Error> {
let mut data = dashboard.lock().unwrap(); let mut data = dashboard.lock().unwrap();
let chain_dir; let chain_dir;
if CONFIG.coingecko_api == "enabled" { if data.chain == "main" {
chain_dir = format!("{}/main/chain_data", CONFIG.grin_dir); chain_dir = format!("{}/main/chain_data", CONFIG.grin_dir);
} else { } else if data.chain == "test" {
chain_dir = format!("{}/test/chain_data", CONFIG.grin_dir); chain_dir = format!("{}/test/chain_data", CONFIG.grin_dir);
} else {
// Chain parameter in get_status() rpc is added in 5.3.3 node.
// Default to main chain in case of node version less than 5.3.3.
chain_dir = format!("{}/main/chain_data", CONFIG.grin_dir);
} }
match get_size(chain_dir.clone()) { match get_size(chain_dir.clone()) {