github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 13:08:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #460 from djs55/iptables-syslog

Browse Source 
Make the iptables wrapper use syslog
This commit is contained in:
Justin Cormack 2016-09-01 11:49:30 +01:00 committed by GitHub
commit 1dd34f6557
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
alpine/packages/diagnostics/capture.go
View File

@ -47,7 +47,6 @@ var (
} }
localCmdCaptures = []CommandCapturer{ localCmdCaptures = []CommandCapturer{
{"/usr/bin/tail", []string{"-100", "/var/log/proxy-vsockd.log"}}, {"/usr/bin/tail", []string{"-100", "/var/log/proxy-vsockd.log"}},
{"/usr/bin/tail", []string{"-100", "/var/log/service-port-opener.log"}},
{"/usr/bin/tail", []string{"-100", "/var/log/vsudd.log"}}, {"/usr/bin/tail", []string{"-100", "/var/log/vsudd.log"}},
} }
localCaptures = []Capturer{NewDatabaseCapturer()} localCaptures = []Capturer{NewDatabaseCapturer()}

4
alpine/packages/iptables/Dockerfile
View File

@ -1,7 +1,7 @@
FROM ocaml/opam:alpine FROM ocaml/opam:alpine
RUN sudo apk add m4 RUN sudo apk add m4
RUN opam install ocamlfind astring -y RUN opam install ocamlfind astring syslog -y
WORKDIR /app WORKDIR /app
ADD . /app ADD . /app
RUN sudo chown -R opam /app RUN sudo chown -R opam /app
RUN opam config exec -- ocamlfind ocamlopt -package unix,astring -linkpkg -o iptables main.ml RUN opam config exec -- ocamlfind ocamlopt -package unix,astring,syslog -linkpkg -o iptables main.ml

10
alpine/packages/iptables/main.ml
View File

@ -16,17 +16,11 @@ type port = {
port: string; (* container port *) port: string; (* container port *)
} }
let log_fd = Unix.openfile "/var/log/service-port-opener.log" [ Unix.O_WRONLY; Unix.O_APPEND; Unix.O_CREAT ] 0o0644 let syslog = Syslog.openlog ~facility:`LOG_SECURITY "iptables-wrapper"
let logf fmt = let logf fmt =
Printf.ksprintf (fun s -> Printf.ksprintf (fun s ->
let s = s ^ "\n" in Syslog.syslog syslog `LOG_INFO s
let rec loop ofs remaining =
if remaining > 0 then begin
let n = Unix.write log_fd s ofs remaining in
loop (ofs + n) (remaining - n)
end in
loop 0 (String.length s)
) fmt ) fmt
let pid_filename { proto; dport; ip; port } = let pid_filename { proto; dport; ip; port } =