From bc6097603373b43a104f40db56dfa93f58712af4 Mon Sep 17 00:00:00 2001 From: Messede Degod <59089310+messede-degod@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:49:59 +0530 Subject: [PATCH 1/3] read config from ./config --- tools/logpipe/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/logpipe/main.go b/tools/logpipe/main.go index 9e2d603..5821df1 100644 --- a/tools/logpipe/main.go +++ b/tools/logpipe/main.go @@ -21,7 +21,7 @@ type LogPipe struct { func main() { lp := LogPipe{} - fbytes, ferr := os.ReadFile("config.yaml") + fbytes, ferr := os.ReadFile("./config/config.yaml") if ferr == nil { err := yaml.Unmarshal(fbytes, &lp) if err != nil { From 98296161820e30e3b21d9f35ccc807d577a7350e Mon Sep 17 00:00:00 2001 From: Messede Degod <59089310+messede-degod@users.noreply.github.com> Date: Thu, 2 Nov 2023 22:50:56 +0530 Subject: [PATCH 2/3] Update docker-compose.yml --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 055e8b4..72e00f9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -106,7 +106,7 @@ services: restart: ${SF_RESTART:-on-failure} cgroup_parent: sf.slice volumes: - - "${SF_BASEDIR:-.}/config/etc/logpipe/config.yaml:/app/config.yaml:ro" + - "${SF_BASEDIR:-.}/config/etc/logpipe/:/app/config/:ro" - "/dev/shm/sf/run/logpipe/:/app/sock/:rw" sf-portd: From 91696ca6b36c7b45952d06d74c21c7b9e0419d16 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 6 Nov 2023 16:36:36 +0000 Subject: [PATCH 3/3] fix: logpipe socket permission Signed-off-by: user --- tools/logpipe/main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/logpipe/main.go b/tools/logpipe/main.go index 5821df1..5328a88 100644 --- a/tools/logpipe/main.go +++ b/tools/logpipe/main.go @@ -47,6 +47,8 @@ func listenOnSocket(socketFile string) { return } + os.Chmod(socketFile, 0777) + for { conn, err := listener.Accept() if err != nil {