github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

change path name to database_path

Browse Source
This commit is contained in:
ghassmo
2021-06-04 18:51:49 +03:00
parent 8e8223769b
commit 15aabbadf0
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/service/options.rs
View File

@@ -5,7 +5,7 @@ pub struct ProgramOptions {
pub accept_addr: Option<SocketAddr>,
pub pub_addr: Option<SocketAddr>,
pub verbose: bool,
pub slabstore_path: Box<std::path::PathBuf>,
pub database_path: Box<std::path::PathBuf>,
pub log_path: Box<std::path::PathBuf>,
}
@@ -18,7 +18,7 @@ impl ProgramOptions {
(@arg ACCEPT: -a --accept +takes_value "Accept add//ress")
(@arg PUB_ADDR: -p --pubaddr +takes_value "Publisher addr")
(@arg VERBOSE: -v --verbose "Increase verbosity")
(@arg SLABSTORE_PATH: --slabstore +takes_value "slabstore path")
(@arg DATABASE_PATH: --database +takes_value "database path")
(@arg LOG_PATH: --log +takes_value "Logfile path")
)
.get_matches();
@@ -37,11 +37,11 @@ impl ProgramOptions {
let verbose = app.is_present("VERBOSE");
let slabstore_path = Box::new(
if let Some(slabstore_path) = app.value_of("SLABSTORE_PATH") {
std::path::Path::new(slabstore_path)
let database_path = Box::new(
if let Some(database_path) = app.value_of("DATABASE_PATH") {
std::path::Path::new(database_path)
} else {
std::path::Path::new("slabstore.db")
std::path::Path::new("database.db")
}
.to_path_buf(),
);
@@ -59,7 +59,7 @@ impl ProgramOptions {
accept_addr,
pub_addr,
verbose,
slabstore_path,
database_path,
log_path,
})
}
@@ -69,7 +69,7 @@ pub struct ClientProgramOptions {
pub connect_addr: Option<SocketAddr>,
pub sub_addr: Option<SocketAddr>,
pub verbose: bool,
pub slabstore_path: Box<std::path::PathBuf>,
pub database_path: Box<std::path::PathBuf>,
pub log_path: Box<std::path::PathBuf>,
}
@@ -82,7 +82,7 @@ impl ClientProgramOptions {
(@arg CONNECT: -c --connect +takes_value "Connect add//ress")
(@arg SUB_ADDR: -s --subaddr +takes_value "Subscriber addr")
(@arg VERBOSE: -v --verbose "Increase verbosity")
(@arg SLABSTORE_PATH: --slabstore +takes_value "slabstore path")
(@arg DATABASE_PATH: --database +takes_value "database path")
(@arg LOG_PATH: --log +takes_value "Logfile path")
)
.get_matches();
@@ -101,11 +101,11 @@ impl ClientProgramOptions {
let verbose = app.is_present("VERBOSE");
let slabstore_path = Box::new(
if let Some(slabstore_path) = app.value_of("SLABSTORE_PATH") {
std::path::Path::new(slabstore_path)
let database_path = Box::new(
if let Some(database_path) = app.value_of("DATABASE_PATH") {
std::path::Path::new(database_path)
} else {
std::path::Path::new("slabstore_client.db")
std::path::Path::new("database_client.db")
}
.to_path_buf(),
);
@@ -123,7 +123,7 @@ impl ClientProgramOptions {
connect_addr,
sub_addr,
verbose,
slabstore_path,
database_path,
log_path,
})
}