X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=frontend.ml;h=59e1a4ce85255dae1fe44c402cf64485bc82ce45;hb=cbb92a81354ca2cb2c2ec5eb0201d3c614755ecb;hp=9d444c3c7242c654a79478f7c33518631dbbd095;hpb=9ec649e8f697ffba675a6a2b7b959e89f80f4eab;p=vsys.git

diff --git a/frontend.ml b/frontend.ml
index 9d444c3..59e1a4c 100644
--- a/frontend.ml
+++ b/frontend.ml
@@ -31,7 +31,7 @@ object(this)
               begin
                 match res with
                   | Success ->
-                      Unixsocketwatcher.openentry root_dir fqp (abspath, slice_name)
+                      ()
                   | _ -> 
                       logprint "Could not create entry %s" abspath
               end
@@ -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) ->