X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=blobdiff_plain;f=main.ml;h=7f91dbf967fa9f18cbacd8efd42a627eabea6100;hp=91df33a2718bb5f6f15a3f29fec73bfc31fa75ff;hb=HEAD;hpb=8ed94d4c37a320acc03f1f3f6523201b42202f00

diff --git a/main.ml b/main.ml
index 91df33a..7f91dbf 100644
--- a/main.ml
+++ b/main.ml
@@ -4,30 +4,68 @@ open Printf
 open Inotify
 open Backend
 open Frontend
-open Fifowatcher
+open Conffile
 
 let input_file_list = ref []
 let cur_dir = ref ""
 let cur_slice = ref ""
+let daemonize = ref false
 
 let cmdspeclist =
   [
+    ("-daemon",Arg.Set(daemonize), "Daemonize");
+    ("-conffile",Arg.Set_string(Globals.conffile), "Config file");
+    ("-logfile",Arg.Set_string(Globals.log_filepath), "Log file");
     ("-backend",Arg.Set_string(Globals.backend), "Backend directory");
-    ("-frontend",Arg.Tuple[Arg.String(fun s->cur_dir:=s);Arg.String(fun s->cur_slice:=s;input_file_list:=(!cur_dir,!cur_slice)::!input_file_list)], "frontendN,slicenameN")
+    ("-frontend",Arg.Tuple[Arg.String(fun s->cur_dir:=s);
+                           Arg.String(fun s->cur_slice:=s;
+                                             input_file_list:=(!cur_dir,!cur_slice)::!input_file_list)], 
+     "frontendN,slicenameN");
+    ("-nochroot",Arg.Set(Globals.nochroot), "Run in non-chroot environment");
+    ("-failsafe",Arg.Set(Globals.failsafe), "Never crash. Be stupid, but never crash. Use at your own risk.");
   ]
 
-let cont = ref true
+let sighup_handle s =
+  print "Received sighup. Running GC major pass";
+  Gc.major ()
 
 let _ =
-  printf "Vsys v%s\n" Globals.vsys_version;flush stdout;
   Arg.parse cmdspeclist (fun x->()) "Usage: vsys <list of mount points>";  
-  if (!Globals.backend == "" || !input_file_list == []) then
-      printf "Try vsys --help\n"
+  Globals.logfd:=open_out_gen [Open_append;Open_creat] 0o644 !log_filepath;
+  if (!Globals.backend == "") then
+    printf "Try vsys --help\n"
   else
     begin
-    Dirwatcher.initialize ();
-    Fifowatcher.initialize ();
-    let felst = List.map (fun lst->new frontendHandler lst) !input_file_list in
-        let _ = new backendHandler !Globals.backend felst in
-         Fdwatcher.start_watch ()
+      logprint "Starting Vsys v%s\n" Globals.vsys_version;
+      if (!daemonize) then
+        begin
+          print "Daemonizing\n";
+          let child = Unix.fork () in
+            if (child <> 0) then
+              begin
+                let pidfile = open_out !Globals.pid_filepath in
+                  fprintf pidfile "%d" child;
+                  close_out pidfile;
+                  exit(0)
+              end
+        end;
+
+      Dirwatcher.initialize ();
+      Directfifowatcher.initialize ();
+
+      if (!Globals.conffile <> "") then
+        begin
+          let frontends = Conffile.read_frontends !Globals.conffile in
+            input_file_list:=List.concat [!input_file_list;frontends]
+        end;
+
+      Sys.set_signal Sys.sigusr1 (Sys.Signal_handle sighup_handle);
+
+      let felst = List.map 
+                    (fun lst->let (x,y)=lst in 
+                       logprint "Slice %s (%s)\n" x y;
+                       new frontendHandler lst) 
+                    !input_file_list in
+      let _ = new backendHandler !Globals.backend felst in
+        Fdwatcher.start_watch ()
     end