Commit 35b3cede authored by Martin Habovstiak's avatar Martin Habovstiak
Browse files

Support for user-specified onfiguration files/dirs

This commit upgrades `configure_me` and adds support for `--conf` and
`--conf-dir` parameters, which load the configuration from the specified
place.
parent 61a5af3a
......@@ -249,7 +249,7 @@ dependencies = [
[[package]]
name = "configure_me"
version = "0.3.2"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"parse_arg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -260,7 +260,7 @@ dependencies = [
[[package]]
name = "configure_me_codegen"
version = "0.3.5"
version = "0.3.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"build-helper 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -347,8 +347,8 @@ dependencies = [
"bincode 1.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"bitcoin 0.18.2 (registry+https://github.com/rust-lang/crates.io-index)",
"bitcoin_hashes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"configure_me 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"configure_me_codegen 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"configure_me 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"configure_me_codegen 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
"dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
......@@ -1236,8 +1236,8 @@ dependencies = [
"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853"
"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
"checksum configure_me 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09bcca54d6219791a348ed074cb1599e47a29fbd33a23b2ba1dffc18231da6b1"
"checksum configure_me_codegen 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f9d597ad7a9c18bb354d15704acef7716819a5f5ab389a720fdef0e7e309f15c"
"checksum configure_me 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "478e5d56a6bff5d410d9d5871cf6e43546a3b14447ffc64286bc97892d5d3b84"
"checksum configure_me_codegen 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5484bb0a4c80e60de0ff7cf989b8f36e3281f28c06e50da070402b6154f17f"
"checksum constant_time_eq 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120"
"checksum crossbeam-channel 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa"
"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71"
......
......@@ -23,7 +23,7 @@ base64 = "0.10"
bincode = "1.0"
bitcoin = { version = "0.18", features = ["use-serde"] }
bitcoin_hashes = "0.3"
configure_me = "0.3.2"
configure_me = "0.3.3"
crossbeam-channel = "0.3"
dirs = "1.0"
error-chain = "0.12"
......@@ -47,4 +47,4 @@ time = "0.1"
tiny_http = "0.6"
[build-dependencies]
configure_me_codegen = "0.3.5"
configure_me_codegen = "0.3.8"
[general]
env_prefix = "ELECTRS"
conf_file_param = "conf"
conf_dir_param = "conf_dir"
doc = """
An efficient re-implementation of Electrum Server, inspired by ElectrumX, Electrum Personal Server and bitcoincore-indexd.
......
......@@ -8,6 +8,8 @@ extern crate log;
extern crate serde_derive;
#[macro_use]
extern crate serde_json;
// I really don't know why it fails without this line
extern crate configure_me;
pub mod app;
pub mod bulk;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment