From b85489208956e4e8cff7782862b79cec8c3a4f16 Mon Sep 17 00:00:00 2001 From: Anthony Grasso Date: Tue, 10 Apr 2018 18:59:27 +1000 Subject: [PATCH] Removed file logger settings from docker image --- src/docs/content/docs/configuration/docker_vars.md | 4 +--- src/server/src/main/docker/Dockerfile | 4 +--- src/server/src/main/docker/cassandra-reaper.yml | 5 ----- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/docs/content/docs/configuration/docker_vars.md b/src/docs/content/docs/configuration/docker_vars.md index df10cf8a9..7d4a556a4 100644 --- a/src/docs/content/docs/configuration/docker_vars.md +++ b/src/docs/content/docs/configuration/docker_vars.md @@ -30,10 +30,8 @@ The Docker environment variables listed in this section map directly to Reaper s REAPER_JMX_AUTH_USERNAME | [username]({{< relref "reaper_specific.md#username" >}}) | REAPER_JMX_CONNECTION_TIMEOUT_IN_SECONDS | [jmxConnectionTimeoutInSeconds]({{< relref "reaper_specific.md#jmxconnectiontimeoutinseconds" >}}) | 20 REAPER_JMX_PORTS | [jmxPorts]({{< relref "reaper_specific.md#jmxports" >}}) | {} -REAPER_LOGGING_APPENDERS_LOG_FORMAT | [logFormat]({{< relref "reaper_specific.md#logformat" >}}) | "%-6level [%d] [%t] %logger{5} - %msg %n" +REAPER_LOGGING_APPENDERS_CONSOLE_LOG_FORMAT | [logFormat]({{< relref "reaper_specific.md#logformat" >}}) | "%-6level [%d] [%t] %logger{5} - %msg %n" REAPER_LOGGING_APPENDERS_CONSOLE_THRESHOLD | [threshold]({{< relref "reaper_specific.md#threshold" >}}) | WARN -REAPER_LOGGING_APPENDERS_FILE_LOG_FORMAT | [logFormat]({{< relref "reaper_specific.md#logformat" >}}) | "%-6level [%t] %logger{5} - %msg %n" -REAPER_LOGGING_APPENDERS_FILE_ARCHIVED_FILE_COUNT | [archivedFileCount]({{< relref "reaper_specific.md#archivedfilecount" >}}) | 99 REAPER_LOGGING_LOGGERS | [loggers]({{< relref "reaper_specific.md#loggers" >}}) | {} REAPER_LOGGING_ROOT_LEVEL | [level]({{< relref "reaper_specific.md#level" >}}) | INFO REAPER_METRICS_FREQUENCY | [fequency]({{< relref "reaper_specific.md#fequency" >}}) | 1 minute diff --git a/src/server/src/main/docker/Dockerfile b/src/server/src/main/docker/Dockerfile index 5bfac0b9d..6550ccf8f 100644 --- a/src/server/src/main/docker/Dockerfile +++ b/src/server/src/main/docker/Dockerfile @@ -28,9 +28,7 @@ ENV REAPER_SEGMENT_COUNT=200 \ REAPER_LOGGING_ROOT_LEVEL=INFO \ REAPER_LOGGING_LOGGERS="{}" \ REAPER_LOGGING_APPENDERS_CONSOLE_LOG_FORMAT='"%-6level [%d] [%t] %logger{5} - %msg %n"' \ - REAPER_LOGGING_APPENDERS_CONSOLE_THRESHOLD=WARN \ - REAPER_LOGGING_APPENDERS_FILE_LOG_FORMAT='"%-6level [%t] %logger{5} - %msg %n"' \ - REAPER_LOGGING_APPENDERS_FILE_ARCHIVED_FILE_COUNT=99 \ + REAPER_LOGGING_APPENDERS_CONSOLE_THRESHOLD=INFO \ REAPER_SERVER_APP_PORT=8080 \ REAPER_SERVER_APP_BIND_HOST="0.0.0.0" \ REAPER_SERVER_ADMIN_PORT=8081 \ diff --git a/src/server/src/main/docker/cassandra-reaper.yml b/src/server/src/main/docker/cassandra-reaper.yml index ed849a096..7b4955439 100644 --- a/src/server/src/main/docker/cassandra-reaper.yml +++ b/src/server/src/main/docker/cassandra-reaper.yml @@ -45,11 +45,6 @@ logging: - type: console logFormat: ${REAPER_LOGGING_APPENDERS_CONSOLE_LOG_FORMAT} threshold: ${REAPER_LOGGING_APPENDERS_CONSOLE_THRESHOLD} - - type: file - logFormat: ${REAPER_LOGGING_APPENDERS_FILE_LOG_FORMAT} - currentLogFilename: /var/log/cassandra-reaper/reaper.log - archivedLogFilenamePattern: /var/log/cassandra-reaper/reaper-%d.log.gz - archivedFileCount: ${REAPER_LOGGING_APPENDERS_FILE_ARCHIVED_FILE_COUNT} server: type: default