Skip to content

Commit 969fc57

Browse files
authored
Adding newline to cluster text log format (#46)
This is needed to separate the cluster log lines.
1 parent a1c0c3c commit 969fc57

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

controllers/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var (
6565
)
6666

6767
const (
68-
ClusterTextLogFormat = "[%START_TIME%] %BYTES_RECEIVED% %BYTES_SENT% %DURATION% \"%DOWNSTREAM_REMOTE_ADDRESS%\" \"%UPSTREAM_HOST%\" \"%UPSTREAM_CLUSTER%\""
68+
ClusterTextLogFormat = "[%START_TIME%] %BYTES_RECEIVED% %BYTES_SENT% %DURATION% \"%DOWNSTREAM_REMOTE_ADDRESS%\" \"%UPSTREAM_HOST%\" \"%UPSTREAM_CLUSTER%\"\n"
6969
AdminTextLogFormat = "[%START_TIME%] \"%REQ(:METHOD)% %REQ(X-ENVOY-ORIGINAL-PATH?:PATH)% %PROTOCOL%\" %RESPONSE_CODE% %RESPONSE_FLAGS% %BYTES_RECEIVED% %BYTES_SENT% %DURATION% %RESP(X-ENVOY-UPSTREAM-SERVICE-TIME)% \"%REQ(X-FORWARDED-FOR)%\" \"%REQ(USER-AGENT)%\" \"%REQ(X-REQUEST-ID)%\" \"%REQ(:AUTHORITY)%\" \"%UPSTREAM_HOST%\"\n"
7070
)
7171

controllers/configmap_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ staticResources:
101101
contentType: application/json; charset=UTF-8
102102
omitEmptyValues: true
103103
textFormatSource:
104-
inlineString: '[%START_TIME%] %BYTES_RECEIVED% %BYTES_SENT% %DURATION%
105-
"%DOWNSTREAM_REMOTE_ADDRESS%" "%UPSTREAM_HOST%" "%UPSTREAM_CLUSTER%"'
104+
inlineString: |
105+
[%START_TIME%] %BYTES_RECEIVED% %BYTES_SENT% %DURATION% "%DOWNSTREAM_REMOTE_ADDRESS%" "%UPSTREAM_HOST%" "%UPSTREAM_CLUSTER%"
106106
cluster: foo_UDP_100
107107
statPrefix: udp_proxy
108108
name: foo_UDP_100
@@ -123,8 +123,8 @@ staticResources:
123123
contentType: application/json; charset=UTF-8
124124
omitEmptyValues: true
125125
textFormatSource:
126-
inlineString: '[%START_TIME%] %BYTES_RECEIVED% %BYTES_SENT% %DURATION%
127-
"%DOWNSTREAM_REMOTE_ADDRESS%" "%UPSTREAM_HOST%" "%UPSTREAM_CLUSTER%"'
126+
inlineString: |
127+
[%START_TIME%] %BYTES_RECEIVED% %BYTES_SENT% %DURATION% "%DOWNSTREAM_REMOTE_ADDRESS%" "%UPSTREAM_HOST%" "%UPSTREAM_CLUSTER%"
128128
cluster: foo_TCP_101
129129
statPrefix: tcp_proxy
130130
name: foo_TCP_101
@@ -354,7 +354,7 @@ staticResources:
354354
t.Error(err)
355355
}
356356
if got != tt.want {
357-
t.Errorf("envoyConfig() = %v, want %v", got, tt.want)
357+
t.Errorf("got:\n%v, want:\n%v", got, tt.want)
358358
t.Error(cmp.Diff(got, tt.want))
359359
}
360360
})

0 commit comments

Comments
 (0)