chore: emqx logs are output to container stdout

emqx · Jul 28, 2022 · 98e5160 · 98e5160
1 parent 2f42361
commit 98e5160
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -14,4 +14,4 @@ EMQX Operator 1.2.3 is released.
 
 - New fields for `.status` in EMQX Custom Resource.
 
-- Now we don't create `volume` and `volumeMount` for EMQX logs anymore
+- Now we don't create `volume` and `volumeMount` for EMQX logs anymore, EMQX logs will output to container stdout by default.
diff --git a/apis/apps/v1beta3/config_type.go b/apis/apps/v1beta3/config_type.go
@@ -13,7 +13,7 @@ func (config EmqxConfig) Default(emqx client.Object) {
 
 	clusterConfig := make(map[string]string)
 	clusterConfig["name"] = emqx.GetName()
-	clusterConfig["log.to"] = "both"
+	clusterConfig["log.to"] = "console"
 	clusterConfig["listener.tcp.external"] = "1883"
 	clusterConfig["listener.ssl.external"] = "8883"
 	clusterConfig["listener.ws.external"] = "8083"

diff --git a/apis/apps/v1beta3/webhook_defaulting_test.go b/apis/apps/v1beta3/webhook_defaulting_test.go
@@ -110,7 +110,7 @@ func checkDefaulting(emqx Emqx) {
 		},
 	}))
 
-	Expect(emqx.GetEmqxConfig()).Should(HaveKeyWithValue("log.to", "both"))
+	Expect(emqx.GetEmqxConfig()).Should(HaveKeyWithValue("log.to", "console"))
 	Expect(emqx.GetEmqxConfig()).Should(HaveKeyWithValue("name", emqx.GetName()))
 	Expect(emqx.GetEmqxConfig()).Should(HaveKeyWithValue("listener.tcp.external", "1883"))
 	Expect(emqx.GetEmqxConfig()).Should(HaveKeyWithValue("listener.ssl.external", "8883"))

diff --git a/config/samples/emqx/v1beta3/emqx-ee.yaml b/config/samples/emqx/v1beta3/emqx-ee.yaml
@@ -75,8 +75,6 @@ spec:
         printenv | grep "^EMQX_"
         emqx foreground
     config:
-      log.level: debug
-      log.to: both
       name: emqx-ee
       cluster.discovery: dns
       cluster.dns.type: srv