X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fdaemons%2Fuwobo%2Fuwobo.ml;h=e7aa1e8f9fc478d8589c3bf749f5a98aa1340280;hb=fdeb64c7f9e870d43a4eb87153bf72e6f5705f01;hp=21fa2c851a26fab61edeee53cfa5e37cbccad10f;hpb=c32591eb2a479cba053d804c350dd0564a2679ae;p=helm.git

diff --git a/helm/software/daemons/uwobo/uwobo.ml b/helm/software/daemons/uwobo/uwobo.ml
index 21fa2c851..e7aa1e8f9 100644
--- a/helm/software/daemons/uwobo/uwobo.ml
+++ b/helm/software/daemons/uwobo/uwobo.ml
@@ -31,7 +31,7 @@ open Uwobo_common;;
 
  (* debugging settings *)
 let debug = false ;;
-let debug_level = `Debug ;;
+let debug_level = `Notice ;;
 let debug_print s = if debug then prerr_endline s ;;
 Http_common.debug := false ;;
 
@@ -288,9 +288,7 @@ let start_new_session cmd_pipe res_pipe outchan port logfile =
           Unix.environment ()
          in
          (* 4. We exec a new copy of uwobo *)
-         Unix.execve Sys.executable_name [||] environment ; 
-         (* It should never reach this point *)
-         assert false
+         Unix.execve Sys.executable_name [||] environment
        ) ()
   | child when child > 0 ->
      (* let's check if the new UWOBO started correctly *)
@@ -476,7 +474,7 @@ let callback
            | None -> Http_daemon.respond_error ~code:(`Status (`Client_error `Bad_request)) outchan ;
          end
     | "/apply" ->
-        let logger = new Uwobo_logger.processingLogger () in
+(*         let logger = new Uwobo_logger.processingLogger () in *)
         veillogger#clearMsgs;
 	let profile = try Some (req#param "profile") with _ -> None in
 	let password = try Some (req#param "password") with _ -> None in
@@ -568,13 +566,6 @@ let callback
       return_error ("Uncaught exception: " ^ (Printexc.to_string exc)) outchan
 ;;
 
-let callback
-  ~syslogger ~styles ~cmd_pipe ~res_pipe () (req: Http_types.request) outchan
-=
-  HExtlib.finally
-    (fun () -> try close_out outchan with Sys_error _ -> ())
-    (callback ~syslogger ~styles ~cmd_pipe ~res_pipe () req) outchan
-
   (* UWOBO's startup *)
 let main () =
     (* (1) system logger *)
@@ -809,8 +800,12 @@ let main () =
         debug_print (sprintf "Starting HTTP daemon on port %d ..." port);
           (* next invocation doesn't return, process will keep on serving HTTP
           requests until it will get killed by father *)
-        Http_daemon.start'~port ~mode:`Fork
-          (callback ~syslogger ~styles ~cmd_pipe ~res_pipe ())
+        let d_spec = Http_daemon.daemon_spec
+            ~port ~mode:`Fork
+            ~callback:(callback ~syslogger ~styles ~cmd_pipe ~res_pipe ())
+            ~auto_close:true ()
+        in
+        Http_daemon.main d_spec
     | _ (* < 0 *) ->  (* fork failed :-((( *)
         failwith "Can't fork :-("
   done