Merge pull request #776 from saschagrunert/systemd-std

Small fixes

conmon-rs/server/Cargo.toml

@@ -11,32 +11,32 @@ path = "src/main.rs"
 anyhow = "1.0.65"
 capnp = "0.14.10"
 capnp-rpc = "0.14.1"
-conmon-common = { path = "../common" }
 clap = { version = "3.2.22", features = ["cargo", "derive", "deprecated", "env", "wrap_help"] }
+conmon-common = { path = "../common" }
 futures = "0.3.24"
 getset = "0.1.2"
-serde = { version = "1.0.145", features = ["derive"] }
-tokio = { version = "1.21.2", features = ["fs", "io-std", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "signal", "time"] }
-tokio-util = { version = "0.7.4", features = ["compat"] }
-nix = "0.25.0"
+lazy_static = "1.4.0"
 libc = "0.2.134"
+libsystemd = "0.5.0"
 memchr = "2.5.0"
-tempfile = "3.3.0"
-sendfd = { version = "0.4.3", features = ["tokio"] }
+multimap = "0.8.3"
+nix = "0.25.0"
+notify = "5.0.0"
 prctl = "1.0.0"
-strum = { version = "0.24.1", features = ["derive"] }
+regex = "1.6.0"
+sendfd = { version = "0.4.3", features = ["tokio"] }
+serde = { version = "1.0.145", features = ["derive"] }
 shadow-rs = "=0.16.1"
-multimap = "0.8.3"
+strum = { version = "0.24.1", features = ["derive"] }
+tempfile = "3.3.0"
+tokio = { version = "1.21.2", features = ["fs", "io-std", "io-util", "macros", "net", "process", "rt", "rt-multi-thread", "signal", "time"] }
+tokio-eventfd = "0.2.0"
+tokio-fd = "0.3.0"
+tokio-util = { version = "0.7.4", features = ["compat"] }
 tracing = "0.1.36"
 tracing-subscriber = "0.3.15"
-uuid = { version = "1.1.2", features = ["v4", "fast-rng", "macro-diagnostics"] }
-regex = "1.6.0"
-notify = "5.0.0"
-tokio-eventfd = "0.2.0"
-lazy_static = "1.4.0"
 tz-rs = "0.6.14"
-tokio-fd = "0.3.0"
-libsystemd = "0.5.0"
+uuid = { version = "1.1.2", features = ["v4", "fast-rng", "macro-diagnostics"] }
 
 [build-dependencies]
 shadow-rs = "=0.16.1"

pkg/client/client.go

@@ -106,7 +106,7 @@ func NewConmonServerConfig(
 ) *ConmonServerConfig {
 	return &ConmonServerConfig{
 		LogLevel:     LogLevelDebug,
-		LogDriver:    LogDriverStdout,
+		LogDriver:    LogDriverSystemd,
 		Runtime:      runtime,
 		RuntimeRoot:  runtimeRoot,
 		ServerRunDir: serverRunDir,

pkg/client/suite_test.go

@@ -208,6 +208,7 @@ func MustFile(file string) string {
 func (tr *testRunner) configGivenEnv() *client.ConmonClient {
 	cfg := client.NewConmonServerConfig(runtimePath, tr.rr.runtimeRoot, tr.tmpDir)
 	cfg.ConmonServerPath = conmonPath
+	cfg.LogDriver = client.LogDriverStdout
 
 	logger := logrus.StandardLogger()
 	logger.Level = logrus.TraceLevel