Commits

Peter Szilagyi  committed 8876e89

Implemented Ron's suggestion for more -j in TOT and noted that usage matches.

  • Participants
  • Parent commits 95394fa
  • Tags 2012-11-05-roll-test

Comments (0)

Files changed (1)

File ocaml/omake/server_config.ml

 let default_warn_when_setting_env_vars = true
 
 let omake_command (t:t) =
-  Config.lookup t ~key:"omake_command" ~default:default_omake_command
-  (* CR pszilagyi: Force a new default, even for those who've customized this, in the wake
-     of Hurricane Sandy.  We have few rackmounts and need to share them well. *)
-  |! ignore;
-  Config.lookup t ~key:"omake_command_after_sandy" ~default:"jomake -j 1"
+  (* CR pszilagyi: Use a new default in TOT in the wake of Hurricane Sandy.  We have few
+     rackmounts and need to share them well.  -j 6 would be a good general default; -j 12
+     is too big for many single-user systems even before Sandy.  As of 2012-11-05 12:00
+     EST, LDN rackmounts have largely cleared out and devs are spread out on the TOT
+     rackmounts to where -j 1 is not longer necessary.  Feedback is modest, and Ron has
+     proposed -j 6 rather than -j 1. *)
+  let key, default =
+    if String.is_prefix ~prefix:"tot-" (Unix.gethostname ())
+    then "omake_command_tot_after_sandy", "jomake -j 6"
+    else "omake_command", default_omake_command
+  in
+  Config.lookup t ~key ~default
 
 let kill_when_unwatched t =
   Config.lookup t ~key:"kill_when_unwatched"
 let t = ref default
 
 let getenv_exn key = match Sys.getenv key with
-| None -> failwithf "No env: %s" key ()
-| Some data -> data
+  | None -> failwithf "No env: %s" key ()
+  | Some data -> data
 
 let home = getenv_exn "HOME"