Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions host/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
4 changes: 3 additions & 1 deletion host/conductora/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ tempdir = "0.3.7"
anyhow = "1"
serde_json = "1.0"
async-trait = "0.1"
futures = "0.3"
#hex = "0.4"
#sha2 = "0.10"
#log = "0.4"
Expand All @@ -43,8 +44,9 @@ map_commands = { path = "../crates/map_commands" }
core_types = { path = "../../shared_crates/type_system/core_types" }

#holochain dependencies
holochain_client = { version = "0.7.0"}
holochain_client = { version = "0.7.1"}
tauri-plugin-holochain = { path = "plugins/tauri-plugin-holochain" }
tokio = { version = "1.5", features = ["rt", "rt-multi-thread"] }

[dev-dependencies] # for unit tests
#tauri = { version = "2", features = ["test"] } #"devtools"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub async fn install_app(
agent_key: Option<AgentPubKey>,
network_seed: Option<NetworkSeed>,
) -> crate::Result<AppInfo> {
tracing::info!("Installing app {}", app_id);
tracing::debug!("Installing app {}", app_id);

let app_info = admin_ws
.install_app(InstallAppPayload {
Expand All @@ -27,14 +27,14 @@ pub async fn install_app(
})
.await
.map_err(|err| crate::Error::ConductorApiError(err))?;
tracing::info!("Installed app {app_info:?}");
tracing::debug!("Installed app {app_info:?}");

let response = admin_ws
.enable_app(app_id.clone())
.await
.map_err(|err| crate::Error::ConductorApiError(err))?;

tracing::info!("Enabled app {app_id:?}");
tracing::debug!("Enabled app {app_id:?}");

Ok(response.app)
}
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ pub(crate) async fn launch_holochain_runtime(
tracing::warn!(
"HOLOCHAIN DEV MODE ENABLED: ephemeral keystore, no signal networking, disposable conductor state"
);
tracing::info!(
tracing::debug!(
"[LAUNCH] DEV MODE: skipping all signal setup (no local signal server launch, no WAN reachability check)"
);
}
SignalLaunchPolicy::PreferLocalWhenSignalUrlMissing => {
tracing::debug!(
"[LAUNCH] Normal mode with signal_url missing/null in config: attempting local signal server startup"
tracing::info!(
"[LAUNCH] PRODUCTION MODE: with signal_url missing/null in config: attempting local signal server startup"
);
let my_local_ip = get_local_ip_address();
let port = portpicker::pick_unused_port().expect("No ports free");
Expand All @@ -103,8 +103,8 @@ pub(crate) async fn launch_holochain_runtime(
}
}
SignalLaunchPolicy::CheckWanWhenSignalUrlConfigured => {
tracing::debug!(
"[LAUNCH] Normal mode with configured signal_url={}; checking WAN signal server reachability",
tracing::info!(
"[LAUNCH] PRODUCTION MODE: with configured signal_url={}; checking WAN signal server reachability",
configured_signal_url.as_str()
);
let connect_result = can_connect_to_signal_server(configured_signal_url.clone()).await;
Expand Down Expand Up @@ -153,7 +153,7 @@ pub(crate) async fn launch_holochain_runtime(

let local_signal_url_for_config = maybe_local_signal_server.as_ref().map(|s| s.0.clone());
if dev_mode && local_signal_url_for_config.is_none() {
tracing::debug!(
tracing::info!(
"[LAUNCH] DEV MODE: no local signal server handle; conductor_config will use local-only placeholder URLs"
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,20 @@ pub fn conductor_config(
network_config.signal_url = local_signal_url;
} else {
let local_only_signal = Url2::parse(DEV_SIGNAL_PLACEHOLDER_URL);
tracing::warn!(
tracing::debug!(
"[LAUNCH] DEV MODE: no local signal override provided; forcing local-only signal_url {}",
local_only_signal.as_str()
);
network_config.signal_url = local_only_signal;
}
let local_only_bootstrap = Url2::parse(DEV_BOOTSTRAP_PLACEHOLDER_URL);
tracing::info!(
tracing::debug!(
"[LAUNCH] DEV MODE: forcing local-only bootstrap_url {}",
local_only_bootstrap.as_str()
);
network_config.bootstrap_url = local_only_bootstrap;
network_config.target_arc_factor = 0;
tracing::info!(
tracing::debug!(
"[LAUNCH] DEV MODE: target_arc_factor set to 0 (leech mode, minimal network participation)"
);

Expand All @@ -88,13 +88,13 @@ pub fn conductor_config(
network_config.advanced = Some(advanced_config);
} else {
if let Some(local_signal_url) = local_signal_url {
tracing::info!(
tracing::debug!(
"[LAUNCH] Normal mode: overriding network signal_url with local runtime URL {}",
local_signal_url.as_str()
);
network_config.signal_url = local_signal_url;
} else {
tracing::info!(
tracing::debug!(
"[LAUNCH] Normal mode: no local signal override provided; using configured/default signal_url {}",
network_config.signal_url.as_str()
);
Expand Down
54 changes: 0 additions & 54 deletions host/conductora/src/config/app_config.rs

This file was deleted.

7 changes: 2 additions & 5 deletions host/conductora/src/config/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
pub mod app_config;
pub mod storage_config;
pub mod storage_manager;
pub mod providers;

//pub use app_config::*;
pub use storage_config::*;
//pub use providers::holochain::*;
pub use storage_manager::*;
Loading
Loading