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