Merge pull request #19 from rafalmiel/systemd-cp-15132

CP-15132: Systemd conversion

_oasis

@@ -20,7 +20,7 @@ Executable forkexecd
   MainIs:             fe_main.ml
   Custom:             true
   Install:            false
-  BuildDepends:       stdext, forkexec, uuidm
+  BuildDepends:       stdext, forkexec, uuidm, systemd
 
 Executable fe_test
   CompiledObject:     best

opam

@@ -15,6 +15,7 @@ remove: [make "uninstall" "BINDIR=%{bin}%" "SBINDIR=%{bin}%" "ETCDIR=%{prefix}%/
 depends: [
   "ocamlfind" {build}
   "oasis" {build}
+  "systemd" {build}
   "syslog"
   "rpc"
   "fd-send-recv"

src/fe_main.ml

@@ -1,7 +1,3 @@
-
-(** We write our PID here when we're ready to receive connections. *)
-let default_pidfile = "/var/run/fe.pid"
-
 open Fe_debug
 
 let setup sock cmdargs id_to_fd_map syslog_stdout redirect_stderr_to_stdout env =
@@ -45,23 +41,11 @@ let setup sock cmdargs id_to_fd_map syslog_stdout redirect_stderr_to_stdout env
   end
 
 let _ =
-  let pidfile = ref default_pidfile in
-  let daemonize = ref false in
-
-  Arg.parse (Arg.align [
-	       "-daemon", Arg.Set daemonize, "Create a daemon";
-	       "-pidfile", Arg.Set_string pidfile, Printf.sprintf "Set the pid file (default \"%s\")" !pidfile;
-	     ])
-    (fun _ -> failwith "Invalid argument")
-    "Usage: fe [-daemon] [-pidfile filename]";
-
-  if !daemonize then Stdext.Unixext.daemonize ();
-
   Sys.set_signal Sys.sigpipe (Sys.Signal_ignore);
 
   let main_sock = Fecomms.open_unix_domain_sock_server "/var/xapi/forker/main" in
 
-  Stdext.Unixext.pidfile_write !pidfile;
+  Daemon.notify Daemon.State.Ready;
 
   (* At this point the init.d script should return and we are listening on our socket. *)