Skip to content
Snippets Groups Projects
Commit 6007e96a authored by Georgy Moshkin's avatar Georgy Moshkin :speech_balloon:
Browse files

refactor: tarantool::cfg().is_some() -> tarantool::is_box_configured()

parent f5f637aa
No related branches found
No related tags found
1 merge request!907Gmoshkin/config.yaml more box cfg parameters
...@@ -617,7 +617,7 @@ fn start_discover( ...@@ -617,7 +617,7 @@ fn start_discover(
tlog!(Info, "entering discovery phase"); tlog!(Info, "entering discovery phase");
luamod::setup(config); luamod::setup(config);
assert!(tarantool::cfg().is_none()); assert!(!tarantool::is_box_configured());
let cfg = tarantool::Cfg::for_discovery(config); let cfg = tarantool::Cfg::for_discovery(config);
let (storage, raft_storage) = init_common(config, &cfg)?; let (storage, raft_storage) = init_common(config, &cfg)?;
...@@ -703,7 +703,7 @@ fn start_boot(config: &PicodataConfig) -> Result<(), Error> { ...@@ -703,7 +703,7 @@ fn start_boot(config: &PicodataConfig) -> Result<(), Error> {
let instance_id = instance.instance_id.clone(); let instance_id = instance.instance_id.clone();
luamod::setup(config); luamod::setup(config);
assert!(tarantool::cfg().is_none()); assert!(!tarantool::is_box_configured());
let cfg = tarantool::Cfg::for_cluster_bootstrap(config, &instance); let cfg = tarantool::Cfg::for_cluster_bootstrap(config, &instance);
let (storage, raft_storage) = init_common(config, &cfg)?; let (storage, raft_storage) = init_common(config, &cfg)?;
...@@ -794,7 +794,7 @@ fn start_join(config: &PicodataConfig, instance_address: String) -> Result<(), E ...@@ -794,7 +794,7 @@ fn start_join(config: &PicodataConfig, instance_address: String) -> Result<(), E
}; };
luamod::setup(config); luamod::setup(config);
assert!(tarantool::cfg().is_none()); assert!(!tarantool::is_box_configured());
let cfg = tarantool::Cfg::for_instance_join(config, &resp); let cfg = tarantool::Cfg::for_instance_join(config, &resp);
let (storage, raft_storage) = init_common(config, &cfg)?; let (storage, raft_storage) = init_common(config, &cfg)?;
......
...@@ -208,10 +208,14 @@ impl Cfg { ...@@ -208,10 +208,14 @@ impl Cfg {
} }
} }
pub fn cfg() -> Option<Cfg> { pub fn is_box_configured() -> bool {
let l = lua_state(); let lua = lua_state();
let b: LuaTable<_> = l.get("box")?; let box_: Option<LuaTable<_>> = lua.get("box");
b.get("cfg") let Some(box_) = box_ else {
return false;
};
let box_cfg: Option<LuaTable<_>> = box_.get("cfg");
box_cfg.is_some()
} }
#[track_caller] #[track_caller]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment