Still trying to fix KyoungSoo's bug

[vsys.git] / dirwatcher.ml

diff --git a/dirwatcher.ml b/dirwatcher.ml
index e06b6fb..a50416f 100644 (file)
--- a/dirwatcher.ml
+++ b/dirwatcher.ml
@@ -34,7 +34,6 @@ let add_watch dir events handler =
 
 let mask_watch fqp =
   try 
-    print "Masking %s %d\n" fqp (String.length fqp);
     Hashtbl.replace masks fqp true
   with _ ->
     ()
@@ -72,14 +71,23 @@ let receive_event (eventdescriptor:fname_and_fd) (bla:fname_and_fd) =
                                      | None->logprint "Unhandled watch descriptor\n"
                                      | Some(handler)->
                                          let fqp = String.concat "/" [dirname;purestr] in
+                                           logprint "Received event from %s\n" fqp;
                                          let mask_filter = Hashtbl.mem masks fqp in
                                            begin
-                                           (*print "Received event for - %s\n"
-                                            * fqp;*)
-                                           if ((not mask_filter) && false) then
-                                                handler wd dirname evlist purestr
+                                           if ((not mask_filter)) then
+                                             begin
+                                               (*
+                                                logprint "Received event for - %s\n"
+                                                        fqp;*)
+                                                handler wd dirname evlist
+                                                 purestr
+                                             end
                                            else
-                                             print "%s is masked\n" fqp
+                                             begin
+                                                (*logprint "Unmasking %s\n"
+                                                 * fqp;*)
+                                                unmask_watch fqp
+                                             end
                                            end
                        end
                    | _ -> ())