X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=directfifowatcher.ml;h=206ca53d54dd4502560dd1bbadc33cf8144c014f;hb=0a4a3a68d48188e50ae321557f4527a8dffaf73a;hp=4ebbe93768084108fd8bed1dee0dacfe6ccb322b;hpb=c83cc6c663566b82531b670f8b492c6ff1e1f18f;p=vsys.git diff --git a/directfifowatcher.ml b/directfifowatcher.ml index 4ebbe93..206ca53 100644 --- a/directfifowatcher.ml +++ b/directfifowatcher.ml @@ -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;