diff --git a/projects/logging/pkg/memlogd/cmd/logread/main.go b/projects/logging/pkg/memlogd/cmd/logread/main.go index 934deb2fc..419b25216 100644 --- a/projects/logging/pkg/memlogd/cmd/logread/main.go +++ b/projects/logging/pkg/memlogd/cmd/logread/main.go @@ -20,7 +20,7 @@ func main() { var follow bool var dumpFollow bool - flag.StringVar(&socketPath, "socket", "/tmp/memlogdq.sock", "memlogd log query socket") + flag.StringVar(&socketPath, "socket", "/var/run/memlogdq.sock", "memlogd log query socket") flag.BoolVar(&dumpFollow, "F", false, "dump log, then follow") flag.BoolVar(&follow, "f", false, "follow log buffer") flag.Parse() diff --git a/projects/logging/pkg/memlogd/cmd/logwrite/main.go b/projects/logging/pkg/memlogd/cmd/logwrite/main.go index 4c325162d..707547237 100644 --- a/projects/logging/pkg/memlogd/cmd/logwrite/main.go +++ b/projects/logging/pkg/memlogd/cmd/logwrite/main.go @@ -37,7 +37,7 @@ func main() { var serverSocket string var name string - flag.StringVar(&serverSocket, "socket", "/tmp/memlogd.sock", "socket to pass fd's to memlogd") + flag.StringVar(&serverSocket, "socket", "/var/run/linuxkit-external-logging.sock", "socket to pass fd's to memlogd") flag.StringVar(&name, "n", "", "name of sender, defaults to first argument if left blank") flag.Parse() args := flag.Args() diff --git a/projects/logging/pkg/memlogd/cmd/memlogd/main.go b/projects/logging/pkg/memlogd/cmd/memlogd/main.go index 524772b11..0c4955815 100644 --- a/projects/logging/pkg/memlogd/cmd/memlogd/main.go +++ b/projects/logging/pkg/memlogd/cmd/memlogd/main.go @@ -255,8 +255,8 @@ func main() { var linesInBuffer int var lineMaxLength int - flag.StringVar(&socketQueryPath, "socket-query", "/tmp/memlogdq.sock", "unix domain socket for responding to log queries. Overridden by -fd-query") - flag.StringVar(&socketLogPath, "socket-log", "/tmp/memlogd.sock", "unix domain socket to listen for new fds to add to log. Overridden by -fd-log") + flag.StringVar(&socketQueryPath, "socket-query", "/var/run/memlogdq.sock", "unix domain socket for responding to log queries. Overridden by -fd-query") + flag.StringVar(&socketLogPath, "socket-log", "/var/run/linuxkit-external-logging.sock", "unix domain socket to listen for new fds to add to log. Overridden by -fd-log") flag.IntVar(&passedLogFD, "fd-log", -1, "an existing SOCK_DGRAM socket for receiving fd's. Overrides -socket-log.") flag.IntVar(&passedQueryFD, "fd-query", -1, "an existing SOCK_STREAM for receiving log read requets. Overrides -socket-query.") flag.IntVar(&linesInBuffer, "max-lines", 5000, "Number of log lines to keep in memory") diff --git a/projects/logging/pkg/memlogd/cmd/startmemlogd/main.go b/projects/logging/pkg/memlogd/cmd/startmemlogd/main.go index 890721bbc..dc696250c 100644 --- a/projects/logging/pkg/memlogd/cmd/startmemlogd/main.go +++ b/projects/logging/pkg/memlogd/cmd/startmemlogd/main.go @@ -16,8 +16,8 @@ func main() { var memlogdBundle string var pidFile string var detach bool - flag.StringVar(&socketLogPath, "socket-log", "/tmp/memlogd.sock", "path to fd logging socket. Created and passed to logging container. Existing socket will be removed.") - flag.StringVar(&socketQueryPath, "socket-query", "/tmp/memlogdq.sock", "path to query socket. Created and passed to logging container. Existing socket will be removed.") + flag.StringVar(&socketLogPath, "socket-log", "/var/run/linuxkit-external-logging.sock", "path to fd logging socket. Created and passed to logging container. Existing socket will be removed.") + flag.StringVar(&socketQueryPath, "socket-query", "/var/run/memlogdq.sock", "path to query socket. Created and passed to logging container. Existing socket will be removed.") flag.StringVar(&memlogdBundle, "bundle", "/containers/init/memlogd", "runc bundle with memlogd") flag.StringVar(&pidFile, "pid-file", "/run/memlogd.pid", "path to pid file") flag.BoolVar(&detach, "detach", true, "detach from subprocess")