From 608f4fdb2e63b083d539bc26f0ac27d4b96169ac Mon Sep 17 00:00:00 2001 From: Anton Afanasyeu Date: Sun, 5 Jul 2026 16:57:37 +0200 Subject: [PATCH] fix bootstrap paths for lab cluster composed backend --- src/bootstrap.php | 58 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/src/bootstrap.php b/src/bootstrap.php index cc202d5..b9db104 100644 --- a/src/bootstrap.php +++ b/src/bootstrap.php @@ -1,17 +1,59 @@ '/var/www/ac/platform', + 'crash_src' => $clusterComposedSrc, + 'config' => $cfg, + ]; + } + + $examplesRoot = dirname($builderRoot, 3); + if (!is_file($examplesRoot . '/platform/shared_session.php')) { + $examplesRoot = dirname($builderRoot, 2); + } + $cfg = $builderRoot . '/config/config.php'; + if (!is_file($cfg)) { + $cfg = $builderRoot . '/config/config.example.php'; + } + return [ + 'platform_dir' => $examplesRoot . '/platform', + 'crash_src' => $examplesRoot . '/crash_reporter/backend/src', + 'config' => $cfg, + ]; } + +$paths = ac_builder_paths(); +require_once $paths['platform_dir'] . '/shared_session.php'; +require_once $paths['platform_dir'] . '/footer.php'; + +$crashSrc = $paths['crash_src']; +$configPath = $paths['config']; $config = require $configPath; +// Cluster: reuse issues DB/session; ensure builder paths when config came from composed issues tree. +if (($config['base_path'] ?? '') === '/app/androidcast_project/issues' + || ($config['base_path'] ?? '') === '/app/androidcast_project/crashes') { + $config['app_name'] = 'Android Cast Builder'; + $config['base_path'] = '/app/androidcast_project/build'; +} + platform_start_session( $config['session_name'] ?? 'ac_crash_sess', $config['session_cookie_path'] ?? '/app/androidcast_project' @@ -63,7 +105,7 @@ function json_out(array $data, int $code = 200): void { } function assets_base(): string { - return rtrim((string) cfg('links.crashes', '/app/androidcast_project/crashes/'), '/'); + return rtrim((string) cfg('links.crashes', '/app/androidcast_project/issues/'), '/'); } /** @return 'running'|'passed'|'failed' */