Skip to content

Commit

Permalink
* For now: Disabled cranelift, and re-enabled pyroscope. (they confli…
Browse files Browse the repository at this point in the history
…ct atm [see #315], and pyroscope is more important for the current dev tasks)
  • Loading branch information
Venryx committed May 20, 2024
1 parent 9b7e3dd commit c4d2a01
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Packages/app-server/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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();
}*/
}
}
5 changes: 4 additions & 1 deletion Tilt/Main.star
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down

0 comments on commit c4d2a01

Please sign in to comment.