Fix rebase conflict.

facebook · Dec 16, 2015 · 6bb315c · 6bb315c
1 parent 40665c6
commit 6bb315c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/hphp/hack/src/procs/worker.ml b/hphp/hack/src/procs/worker.ml
@@ -217,7 +217,7 @@ let register_entry_point ~save ~restore =
         Unix.clear_close_on_exec heap_handle.SharedMem.h_fd;
         let handle =
           Daemon.spawn
-            ~log_file
+            (* ~log_file *)
             ~log_mode:Daemon.Log_append
             ~reason:"worker" entry
             (saved_state, gc_control, heap_handle) in
@@ -273,7 +273,7 @@ let call w (type a) (type b) (f : a -> b) (x : a) : b handle =
   let result () : b =
     match Unix.waitpid [Unix.WNOHANG] slave_pid with
     | 0, _ | _, Unix.WEXITED 0 ->
-        let res : b = Timeout.input_value (Daemon.cast_in inc) in
+        let res : b = input_value (Daemon.cast_in inc) in
         if w.prespawned = None then Daemon.close h;
         res
     | _, Unix.WEXITED i when i = Exit_status.(to_int Out_of_shared_memory) ->

diff --git a/hphp/hack/src/server/serverMonitor.ml b/hphp/hack/src/server/serverMonitor.ml
@@ -75,7 +75,7 @@ let setup_autokill_typechecker_on_exit typechecker =
 let start_hh_server options log_mode =
   let log_file =
     match log_mode with
-    | Daemon.Log_file ->
+    | Daemon.Log_file | Daemon.Log_append ->
       let log_link = ServerFiles.log_link (ServerArgs.root options) in
       (try Sys.rename log_link (log_link ^ ".old") with _ -> ());
       let log_file = ServerFiles.make_link_of_timestamped log_link in

diff --git a/hphp/hack/src/server/serverProcessTools.ml b/hphp/hack/src/server/serverProcessTools.ml
@@ -45,7 +45,7 @@ let check_exit_status proc_stat typechecker =
   | _ ->
     let exit_kind, exit_code = Exit_status.unpack proc_stat in
     match typechecker.log_mode with
-    | Daemon.Log_file ->
+    | Daemon.Log_file | Daemon.Log_append ->
       let oc = open_out_gen [Open_creat; Open_append; Open_binary] 0o666
         typechecker.log_file in
       Printf.fprintf oc "hh_server %s with exit code %d\n"

diff --git a/hphp/hack/src/utils/daemon.mli b/hphp/hack/src/utils/daemon.mli
@@ -28,7 +28,7 @@ val flush : 'a out_channel -> unit
 (* This breaks the type safety, but is necessary in order to allow select() *)
 val descr_of_in_channel : 'a in_channel -> Unix.file_descr
 val descr_of_out_channel : 'a out_channel -> Unix.file_descr
-val cast_in : 'a in_channel -> Timeout.in_channel
+val cast_in : 'a in_channel -> Pervasives.in_channel
 val cast_out : 'a out_channel -> Pervasives.out_channel
 
 (** Spawning new process *)