X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=blobdiff_plain;f=frontend.ml;h=cff3c6427db56f4467a11c12fec091779707a951;hp=9d444c3c7242c654a79478f7c33518631dbbd095;hb=b8b329f72fa44685bbd522cb5312dd19d352f580;hpb=9ec649e8f697ffba675a6a2b7b959e89f80f4eab diff --git a/frontend.ml b/frontend.ml index 9d444c3..cff3c64 100644 --- a/frontend.ml +++ b/frontend.ml @@ -77,12 +77,25 @@ object(this) let fqp = String.concat "/" [root_dir;rel] in let fqp_in = String.concat "." [fqp;"in"] in let fqp_out = String.concat "." [fqp;"out"] in - Directfifowatcher.closeentry fqp; - try - Unix.unlink fqp_in; - Unix.unlink fqp_out - with _ -> - logprint "Hm. %s disappeared. Looks like slice %s shot itself in the foot\n" fqp (this#get_slice_name ()) + let fqp_control = String.concat "." [fqp;"out"] in + + if (this#is_fd_passer rel) then + begin + Unixsocketwatcher.closeentry fqp; + try + Unix.unlink fqp_control + with _ -> + logprint "Hm. %s disappeared. Looks like slice %s shot itself in the foot\n" fqp (this#get_slice_name ()) + end + else + begin + Directfifowatcher.closeentry fqp; + try + Unix.unlink fqp_in; + Unix.unlink fqp_out + with _ -> + logprint "Hm. %s disappeared. Looks like slice %s shot itself in the foot\n" fqp (this#get_slice_name ()) + end method rmdir rp = match rp with Relpath(rel) ->