-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2197 from darh/json_log_format
Add more control over log_format config directive
- Loading branch information
Showing
6 changed files
with
133 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
import pytest | ||
|
||
def test_log_json(docker_compose, nginxproxy): | ||
log_conf = [line for line in nginxproxy.get_conf().decode('ASCII').splitlines() if "log_format vhost escape=" in line] | ||
assert "{\"time_local\":\"$time_iso8601\"," in log_conf[0] | ||
|
||
r = nginxproxy.get("http://nginx-proxy.test/port") | ||
assert r.status_code == 200 | ||
assert r.text == "answer from port 81\n" | ||
sut_container = docker_compose.containers.get("sut") | ||
docker_logs = sut_container.logs(stdout=True, stderr=True, stream=False, follow=False) | ||
docker_logs = docker_logs.decode("utf-8").splitlines() | ||
docker_logs = [line for line in docker_logs if "{\"time_local\":" in line] | ||
assert "GET /port" in docker_logs[0] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
version: "2" | ||
|
||
services: | ||
web1: | ||
image: web | ||
expose: | ||
- "81" | ||
environment: | ||
WEB_PORTS: 81 | ||
VIRTUAL_HOST: nginx-proxy.test | ||
|
||
sut: | ||
container_name: sut | ||
image: nginxproxy/nginx-proxy:test | ||
volumes: | ||
- /var/run/docker.sock:/tmp/docker.sock:ro | ||
environment: | ||
LOG_JSON: 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
import pytest | ||
|
||
def test_log_json_format(docker_compose, nginxproxy): | ||
log_conf = [line for line in nginxproxy.get_conf().decode('ASCII').splitlines() if "log_format vhost escape=" in line] | ||
assert "{\"time_local\":\"$time_iso8601\"," in log_conf[0] | ||
|
||
r = nginxproxy.get("http://nginx-proxy.test/port") | ||
assert r.status_code == 200 | ||
assert r.text == "answer from port 81\n" | ||
sut_container = docker_compose.containers.get("sut") | ||
docker_logs = sut_container.logs(stdout=True, stderr=True, stream=False, follow=False) | ||
docker_logs = docker_logs.decode("utf-8").splitlines() | ||
docker_logs = [line for line in docker_logs if "{\"time_local\":" in line] | ||
assert "GET /port" in docker_logs[0] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
version: "2" | ||
|
||
services: | ||
web1: | ||
image: web | ||
expose: | ||
- "81" | ||
environment: | ||
WEB_PORTS: 81 | ||
VIRTUAL_HOST: nginx-proxy.test | ||
|
||
sut: | ||
container_name: sut | ||
image: nginxproxy/nginx-proxy:test | ||
volumes: | ||
- /var/run/docker.sock:/tmp/docker.sock:ro | ||
environment: | ||
LOG_FORMAT: '{"time_local":"$$time_iso8601","remote_addr":"$$remote_addr","request":"$$request","upstream_addr":"$$upstream_addr"}' |