scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-11-12 08:41:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Align worker configuration imports with crate conventions

Browse source
This commit is contained in:
Scott Werner 2026-10-23 15:02:40 -04:00
parent d31c7c0b12
commit 7494cea227
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/apps/fabro-server/src/server.rs
View file

@ -151,7 +151,7 @@ use crate::sandbox_access::{
SandboxInventory,
};
use crate::server_secrets::ServerSecrets;
use crate::spawn_env::apply_render_graph_env;
use crate::spawn_env::{SandboxConnectionEnv, apply_render_graph_env};
use crate::worker_control::{
LocalWorkerControlBus, WORKER_CONTROL_ACK_WAIT, WorkerControlAcks, WorkerControlBus,
WorkerControlBusError,
@ -3957,7 +3957,7 @@ fn worker_launch_spec(
active_config_path: state.active_config_path().to_path_buf(),
github_app_private_key,
fabro_home: fabro_config::Home::from_env().root().to_path_buf(),
sandbox_connection_env: crate::spawn_env::SandboxConnectionEnv::from_lookup(|name| {
sandbox_connection_env: SandboxConnectionEnv::from_lookup(|name| {
state.config_env_lookup(name)
}),
})

4
lib/apps/fabro-server/src/worker_runtime.rs
View file

@ -12,7 +12,7 @@ use futures_util::future::BoxFuture;
use tokio::io::AsyncRead;
use tokio::process::Command;
use crate::spawn_env::{SandboxConnectionEnv, apply_worker_env};
use crate::spawn_env::{self, SandboxConnectionEnv};
#[async_trait]
pub(crate) trait WorkerRuntime: Send + Sync {
@ -114,7 +114,7 @@ impl LocalWorkerRuntime {
.stdout(worker_stdout)
.stderr(Stdio::piped());
apply_worker_env(&mut cmd);
spawn_env::apply_worker_env(&mut cmd);
spec.sandbox_connection_env.apply(&mut cmd);
if let Some(level) = spec.fabro_log.as_deref() {
cmd.env(EnvVars::FABRO_LOG, level);