Switch build system to Dune

.gitignore

@@ -1,7 +1,6 @@
 _build/
-*.native
-*.byte
-*.install
+logs-syslog.install
+src/**/.merlin
 
 example/mirage-unikernel-*.opam
 example/.mirage.config
@@ -15,4 +14,4 @@ example/syslog*
 *.key
 *.pem
 *.csr
-certs/
+certs/

dune-project

@@ -0,0 +1,2 @@
+(lang dune 1.1)
+(name logs-syslog)

opam → logs-syslog.opam

@@ -9,9 +9,7 @@ license: "ISC"
 available: [ ocaml-version >= "4.03.0"]
 
 depends: [
-  "ocamlfind" {build}
-  "ocamlbuild" {build}
-  "topkg" {build}
+  "dune" {>= "1.1.0" & build}
   "logs"
   "ptime"
   "syslog-message" {>= "0.0.2"}
@@ -30,12 +28,4 @@ conflicts: [
   "tls" {< "0.8.0"}
 ]
 
-build: [
-  [ "ocaml" "pkg/pkg.ml" "build" "--pinned" "%{pinned}%"
-    "--with-lwt" "%{lwt:installed}%"
-    "--with-lwt-tls" "%{lwt+x509+tls+cstruct:installed}%"
-    "--with-mirage" "%{lwt+mirage-stack-lwt+mirage-console-lwt+mirage-clock+cstruct+ipaddr:installed}%"
-    "--with-mirage-tls" "%{lwt+mirage-kv-lwt+x509+tls+mirage-stack-lwt+mirage-console-lwt+mirage-clock+cstruct+ipaddr:installed}%"
- ]
-]
-
+build: [ "dune" "build" "-p" name "-j" jobs ]

src/dune

@@ -0,0 +1,16 @@
+(env
+  (_ (flags -w +A-4-44 -safe-string -principal)))
+
+(library
+  (name        logs_syslog)
+  (public_name logs-syslog)
+  (synopsis    "Emit logs via syslog")
+  (libraries   logs syslog-message ptime)
+  (modules     logs_syslog))
+
+(library
+  (name        logs_syslog_unix)
+  (public_name logs-syslog.unix)
+  (synopsis    "Unix syslog reporter")
+  (libraries   logs-syslog ptime.clock.os unix)
+  (modules     logs_syslog_unix))

src/lwt-tls/dune

@@ -0,0 +1,6 @@
+(library
+  (name        logs_syslog_lwt_tls)
+  (public_name logs-syslog.lwt.tls)
+  (synopsis    "Lwt TLS syslog reporter")
+  (libraries   logs-syslog.lwt x509 tls tls.lwt cstruct)
+  (optional))

src/logs_syslog_lwt_tls.ml → src/lwt-tls/logs_syslog_lwt_tls.ml

@@ -1,5 +1,5 @@
 open Lwt.Infix
-open Logs_syslog_lwt_common
+open Logs_syslog_lwt__Logs_syslog_lwt_common
 open Logs_syslog
 
 let tcp_tls_reporter
@@ -24,17 +24,17 @@ let tcp_tls_reporter
          Tls_lwt.Unix.client_of_fd conf sock >|= fun t ->
          tls := Some t ;
          Ok ())
-      (fun exn ->
-         Lwt.return @@ match exn with
+      (function
          | Unix.Unix_error (e, f, _) ->
            let err =
              Printf.sprintf "error %s in function %s while connecting to %s:%d"
                (Unix.error_message e) f (Unix.string_of_inet_addr ip) port
            in
-           Error err
+           Lwt.return @@ Error err
          | Tls_lwt.Tls_failure f ->
            let err = Tls.Engine.string_of_failure f in
-           Error (Printf.sprintf "TLS failure %s" err))
+           Lwt.return @@ Error (Printf.sprintf "TLS failure %s" err)
+         | exn -> Lwt.fail exn)
   in
   let reconnect k msg =
     Lwt_mutex.lock m >>= fun () ->
@@ -73,7 +73,8 @@ let tcp_tls_reporter
               Lwt.catch
                 (fun () -> Tls_lwt.Unix.close t)
                 (fun _ -> Lwt.return_unit) >>= fun () ->
-              reconnect send omsg)
+              reconnect send omsg
+            | exn -> Lwt.fail exn)
     in
     at_exit (fun () -> match !tls with
         | None -> ()

src/lwt/dune

@@ -0,0 +1,9 @@
+(library
+  (name        logs_syslog_lwt)
+  (public_name logs-syslog.lwt)
+  (synopsis    "Lwt syslog reporter")
+  (libraries   logs-syslog ptime.clock.os lwt lwt.unix)
+  (optional))
+
+(rule (copy ../logs_syslog_lwt_common.mli logs_syslog_lwt_common.mli))
+(rule (copy ../logs_syslog_lwt_common.ml logs_syslog_lwt_common.ml))

src/logs_syslog_lwt.ml → src/lwt/logs_syslog_lwt.ml

@@ -15,7 +15,8 @@ let udp_reporter ?hostname ip ?(port = 514) ?(truncate = 65535) ?facility () =
             f (Unix.error_message e) (Unix.string_of_inet_addr ip) port
             (Ptime.to_rfc3339 (Ptime_clock.now ()))
             msg ;
-          Lwt.return_unit)
+          Lwt.return_unit
+        | exn -> Lwt.fail exn)
   in
   (match hostname with
    | Some x -> Lwt.return x
@@ -40,7 +41,8 @@ let tcp_reporter ?hostname ip ?(port = 514) ?(truncate = 0) ?(framing = `Null) ?
            Printf.sprintf "error %s in function %s while connecting to %s:%d"
              (Unix.error_message e) f (Unix.string_of_inet_addr ip) port
          in
-         Lwt.return (Error err))
+         Lwt.return (Error err)
+       | exn -> Lwt.fail exn)
   in
   let reconnect k msg =
     Lwt_mutex.lock m >>= fun () ->
@@ -73,8 +75,10 @@ let tcp_reporter ?hostname ip ?(port = 514) ?(truncate = 0) ?(framing = `Null) ?
                  Printf.eprintf "error %s in function %s, reconnecting\n" err f ;
                  Lwt.catch
                    (fun () -> Lwt_unix.close sock)
-                   (function Unix.Unix_error _ -> Lwt.return_unit) >>= fun () ->
-                 reconnect send omsg >|= fun () -> should)) >>= fun n ->
+                   (function Unix.Unix_error _ -> Lwt.return_unit
+                           | exn -> Lwt.fail exn) >>= fun () ->
+                 reconnect send omsg >|= fun () -> should
+               | exn -> Lwt.fail exn)) >>= fun n ->
           if n = should then
             Lwt.return_unit
           else

src/mirage-tls/dune

@@ -0,0 +1,6 @@
+(library
+  (name        logs_syslog_mirage_tls)
+  (public_name logs-syslog.mirage.tls)
+  (synopsis    "Mirage TLS syslog reporter")
+  (libraries   logs-syslog.mirage x509 tls tls.mirage mirage-kv-lwt)
+  (optional))

src/logs_syslog_mirage_tls.ml → src/mirage-tls/logs_syslog_mirage_tls.ml

@@ -60,7 +60,7 @@ module Tls (C : Mirage_console_lwt.S) (CLOCK : Mirage_clock.PCLOCK) (STACK : Mir
     in
     connect () >|= function
     | Ok () ->
-      Ok (Logs_syslog_lwt_common.syslog_report_common
+      Ok (Logs_syslog_mirage__Logs_syslog_lwt_common.syslog_report_common
             facility
             hostname
             truncate

src/mirage/dune

@@ -0,0 +1,9 @@
+(library
+  (name        logs_syslog_mirage)
+  (public_name logs-syslog.mirage)
+  (synopsis    "Mirage syslog reporter")
+  (libraries   logs-syslog ipaddr lwt mirage-console-lwt mirage-clock mirage-stack-lwt cstruct)
+  (optional))
+
+(rule (copy ../logs_syslog_lwt_common.mli logs_syslog_lwt_common.mli))
+(rule (copy ../logs_syslog_lwt_common.ml logs_syslog_lwt_common.ml))