From c4d2a01c6650b0d2d25ba70c9ec4321867b7e458 Mon Sep 17 00:00:00 2001 From: Venryx Date: Sun, 19 May 2024 18:15:13 -0700 Subject: [PATCH] * For now: Disabled cranelift, and re-enabled pyroscope. (they conflict atm [see #315], and pyroscope is more important for the current dev tasks) --- Packages/app-server/src/main.rs | 8 ++++---- Tilt/Main.star | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Packages/app-server/src/main.rs b/Packages/app-server/src/main.rs index d38ec46a..c1bad33c 100644 --- a/Packages/app-server/src/main.rs +++ b/Packages/app-server/src/main.rs @@ -56,8 +56,8 @@ mod router; #[tokio::main] async fn main() { let _sentry_guard = set_up_globals(); - //#[cfg(unix)] let agent = set_up_globals_linux(); - //#[cfg(unix)] let agent_running = agent.start().unwrap(); + #[cfg(unix)] let agent = set_up_globals_linux(); + #[cfg(unix)] let agent_running = agent.start().unwrap(); println!("Setup of globals completed."); // have one regular print-line, in case logger has issues let app_state = AppState::new_in_arc(); @@ -71,8 +71,8 @@ async fn main() { // start router; this handles all "external web requests" start_router(app_state).await; - /*#[cfg(unix)] { + #[cfg(unix)] { let agent_ready = agent_running.stop().unwrap(); agent_ready.shutdown(); - }*/ + } } \ No newline at end of file diff --git a/Tilt/Main.star b/Tilt/Main.star index 6059c0ac..5f9469b6 100644 --- a/Tilt/Main.star +++ b/Tilt/Main.star @@ -85,7 +85,10 @@ if os.getenv("TIME_OF_TILT_UP_COMMAND") == None: os.putenv("TIME_OF_TILT_UP_COMMAND", timeOfThisTiltfileUpdate) timeOfTiltUpCommand = os.getenv("TIME_OF_TILT_UP_COMMAND") -compileWithCranelift = cfg.get("compileWithCranelift", True) +#compileWithCranelift = cfg.get("compileWithCranelift", True) +# temp; have cranelift default to off for now, since cranelift currently conflicts with pyroscope, and pyroscope is more important atm +compileWithCranelift = cfg.get("compileWithCranelift", False) + compileWithRelease = cfg.get("compileWithRelease", PROD) # default to compiling: PROD -> release, DEV (or others) -> debug g = {