X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=directfifowatcher.ml;h=206ca53d54dd4502560dd1bbadc33cf8144c014f;hb=0a4a3a68d48188e50ae321557f4527a8dffaf73a;hp=dc7a9854ac9b043b9c7f1319d91e3899a0e77fb6;hpb=fa2fedc9aa9d571c5907d9b71908beb9f46489fb;p=vsys.git

diff --git a/directfifowatcher.ml b/directfifowatcher.ml
index dc7a985..206ca53 100644
--- a/directfifowatcher.ml
+++ b/directfifowatcher.ml
@@ -53,7 +53,7 @@ let list_check lst elt _ =
   in
     list_check_rec lst
 
-let openentry_int fifoin =
+let fs_openentry fifoin =
   let fdin =
     try openfile fifoin [O_RDONLY;O_NONBLOCK] 0o777 with 
         e->logprint "Error opening and connecting FIFO: %s,%o\n" fifoin 0o777;raise e
@@ -63,7 +63,7 @@ let openentry_int fifoin =
 (** Open entry safely, by first masking out the file to be opened *)
 let openentry_safe root_dir fqp_in backend_spec =
   let restore = move_gate fqp_in in
-  let fd_in = openentry_int restore in
+  let fd_in = fs_openentry restore in
     move_ungate fqp_in restore;
     let (fqp,slice_name) = backend_spec in
       Hashtbl.replace direct_fifo_table fqp_in (Some(root_dir,fqp,slice_name,fd_in))
@@ -93,13 +93,20 @@ let connect_file fqp_in =
               try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
                   _-> (* The client is opening the descriptor too fast *)
                     sleep 1;try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
-                        _->
-                        logprint "%s Output pipe not open, using stdout in place of %s\n" slice_name fqp_out;stdout
+                      _->
+                        logprint "%s Output pipe not open, using stdout in place of %s\n" slice_name fqp_out;
+                        logprint "Check if vsys script %s is executable\n" execpath;
+                        stdout
             in
               ignore(sigprocmask SIG_BLOCK [Sys.sigchld]);
               (
                 clear_nonblock fifo_fdin;
-                let pid=try Some(create_process execpath [|execpath;slice_name|] fifo_fdin fifo_fdout fifo_fdout) with e -> None in
+                let pid = 
+                  try
+                    Some(create_process execpath [|execpath;slice_name|] fifo_fdin fifo_fdout fifo_fdout) 
+                  with 
+                    e -> logprint "Error executing %s for slice %s\n" execpath slice_name; None
+                in
                   match pid with 
                     | Some(pid) ->
                         if (fifo_fdout <> stdout) then close_if_open fifo_fdout;
@@ -155,7 +162,8 @@ let sigchld_handle s =
             try
               let fqp_in,fd_out = Hashtbl.find pidmap pid in
                 begin
-                  reopenentry fqp_in
+                  reopenentry fqp_in;
+                  Hashtbl.remove pidmap pid
                 end
             with _ -> ()
           end;
@@ -164,7 +172,11 @@ let sigchld_handle s =
   in
     reap_all_processes()
                 
-
+(** The backendhandler class: defines event handlers for events in
+the backend backend directory.
+  @param dir_root The location of the backend in the server context (eg. root context for vservers)
+  @param frontend_list List of frontends to serve with this backend
+  *)
 let rec add_dir_watch fqp =
   Dirwatcher.add_watch fqp [S_Open] direct_fifo_handler
 and