Merge pull request #227 from koushiro/improve-config

Improve archive config

Author: dvdplm

Cargo.lock

@@ -3,17 +3,17 @@ name = "node-template-archive"
 version = "0.2.1"
 authors = ["Andrew Plaza <aplaza@liquidthink.net>"]
 edition = "2018"
+description = "Indexes Substrate Data"
 
 [dependencies]
 anyhow = "1.0"
-clap = { version = "2.33.1", features = ["yaml", "suggestions", "color"] }
 ctrlc = { version = "3.1.5", features = ["termination"] }
 log = "0.4"
 serde = "1.0"
+structopt = { version = "0.3", features = ["suggestions", "color"] }
 toml = "0.5"
 
 node-template-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
 node-template = { git = "https://github.com/paritytech/substrate", branch = "master" }
 
-substrate-archive = { path = "../../substrate-archive", features = ["logging"] }
-substrate-archive-backend = { path = "../../substrate-archive-backend" }
+substrate-archive = { path = "../../substrate-archive" }

bin/node-template-archive/Cargo.lock

@@ -0,0 +1,78 @@
+[chain]
+# Must be an absolute path to chain data db (no ~/)
+# Can also be specified via the `CHAIN_DATA_DB` environment variable
+data_path = "/.local/share/node-template/chains/dev/db"
+
+# How much should the read-only database keep in cache (MB)
+# Optional, default: 128
+cache_size = 128
+
+# RocksDB secondary directory
+# Optional, default: /<local>/substrate_archive/rocksdb_secondary/
+rocksdb_secondary_path = "./substrate_archive/rocksdb_secondary"
+
+[runtime]
+# Specification of different methods of executing the runtime Wasm code.
+# Optional, "Interpreted" or "Compiled", default: "Interpreted".
+#exec_method = "Interpreted"
+
+# Number of threads to dedicate for executing blocks
+# Optional, default: the number of logical system threads.
+block_workers = 4
+
+# Number of 64KB Heap Pages to allocate for WASM execution
+# Optional, default: 1024.
+wasm_pages = 256
+
+[database]
+# Database url.
+# Each chain needs it's own PostgreSQL database
+# Can also be specified via the `DATABASE_URL` environment variable.
+# For production use, using `DATABASE_URL` is preferable.
+# More info on the wiki: https://github.com/paritytech/substrate-archive/wiki/1.)-Requirements.
+url = "postgres://user:pass@localhost:5432/archive"
+
+[log]
+# Optional log level of stdout, default: "DEBUG"
+std = "DEBUG"
+
+# Optional file log.
+#[log.file]
+# Optional log level of file, default: "DEBUG"
+#level = "DEBUG"
+# Optional log file directory path, default: "/<local>/substrate_archive/"
+#dir = "./output/"
+# Optional log file name, default: "archive.log"
+#name = "archive.log"
+
+# Advanced options
+#
+# Changing these may lead to unexpected results.
+[control]
+# Number of database actors to be spawned.
+# Optional, default: 4
+db_actor_pool_size = 4
+
+# Number of threads to dedicate for executing tasks
+# Optional, default: the number of logical system threads
+task_workers = 8
+
+# Timeout to wait for a task to start execution.
+# Optional, default: 20 seconds
+task_timeout = 20
+
+# Maximum number of tasks to queue in the threadpool.
+# Optional, default: 64
+max_tasks = 64
+
+# Maximium number of blocks to load and insert into database at a time.
+# Useful for controlling memory usage.
+# Optional, defaults: 100,000
+max_block_load = 100000
+
+[wasm_tracing]
+# Targets for tracing.
+targets = '''wasm_tracing,pallet,frame,state'''
+
+# Folder where tracing-enabled WASM binaries are kept.
+#folder = ""

bin/node-template-archive/Cargo.toml

@@ -14,39 +14,45 @@
 // You should have received a copy of the GNU General Public License
 // along with substrate-archive.  If not, see <http://www.gnu.org/licenses/>.
 
-use std::path::PathBuf;
+use std::{fs, path::PathBuf};
 
-use clap::{load_yaml, App};
+use anyhow::Result;
+use structopt::StructOpt;
 
-#[derive(Clone)]
+use substrate_archive::ArchiveConfig;
+
+#[derive(Clone, StructOpt)]
+#[structopt(author, about)]
 pub struct CliOpts {
-	pub file: Option<PathBuf>,
-	pub log_level: log::LevelFilter,
+	/// Sets a custom config file
+	#[structopt(short = "c", long, name = "FILE")]
+	pub config: Option<PathBuf>,
+	/// Sets spec for chain to run in (dev/local).
+	#[structopt(short = "s", long = "spec", name = "CHAIN", parse(from_str = parse_chain_spec))]
 	pub chain_spec: node_template::chain_spec::ChainSpec,
 }
 
+fn parse_chain_spec(spec: &str) -> node_template::chain_spec::ChainSpec {
+	let spec = match spec {
+		"dev" => node_template::chain_spec::development_config(),
+		"" | "local" => node_template::chain_spec::local_testnet_config(),
+		path => node_template::chain_spec::ChainSpec::from_json_file(PathBuf::from(path)),
+	};
+	spec.expect("Chain spec could not be loaded")
+}
+
 impl CliOpts {
-	pub fn parse() -> Self {
-		let yaml = load_yaml!("cli_opts.yaml");
-		let matches = App::from(yaml).get_matches();
-		let file = matches.value_of("config");
-		let log_level = match matches.occurrences_of("verbose") {
-			0 => log::LevelFilter::Info,
-			1 => log::LevelFilter::Info,
-			2 => log::LevelFilter::Info,
-			3 => log::LevelFilter::Debug,
-			4 | _ => log::LevelFilter::Trace,
-		};
-		let chain_spec = match matches.value_of("spec") {
-			Some("dev") => node_template::chain_spec::development_config(),
-			Some("") | Some("local") => node_template::chain_spec::local_testnet_config(),
-			Some(path) => node_template::chain_spec::ChainSpec::from_json_file(PathBuf::from(path)),
-			_ => panic!("Chain spec could not be loaded; is the path correct?"),
-		};
-		CliOpts {
-			file: file.map(PathBuf::from),
-			log_level,
-			chain_spec: chain_spec.expect("Chain spec could not be loaded"),
+	pub fn init() -> Self {
+		CliOpts::from_args()
+	}
+
+	pub fn parse(&self) -> Result<Option<ArchiveConfig>> {
+		if let Some(config) = &self.config {
+			let toml_str = fs::read_to_string(config.as_path())?;
+			let config = toml::from_str::<ArchiveConfig>(toml_str.as_str())?;
+			Ok(Some(config))
+		} else {
+			Ok(None)
 		}
 	}
 }