Commit e93c7cce authored by Matt Pryor's avatar Matt Pryor
Browse files

Make Tomcat access log redirection work

parent 5b4ac20f

deploy/kubernetes/chart/templates/thredds/deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ spec: 
            - name: thredds-cache

              mountPath: /opt/tomcat/content/thredds/cache

            - name: thredds-logs

              mountPath: /opt/tomcat/content/thredds/logs

              mountPath: /opt/tomcat/logs

            {{- include "esgf.data.volumeMounts" . | nindent 12 }}

            {{- with $thredds.extraVolumeMounts }}

            {{- toYaml . | nindent 12 }}

images/thredds/Dockerfile

+10 −10
Original line number Diff line number Diff line
@@ -29,17 +29,17 @@ USER root 
# Make the cache directory with correct permissions and declare it as a volume

# This ensures that Docker named volumes will work correctly

#

# Make the log directory and create symlinks for log files to stdout

RUN mkdir -p ./content/thredds/{cache,logs} && \

    ln -s /dev/stdout ./content/thredds/logs/serverStartup.log && \

    ln -s /dev/stdout ./content/thredds/logs/catalogInit.log && \

    ln -s /dev/stdout ./content/thredds/logs/httpout.log && \

    ln -s /dev/stdout ./content/thredds/logs/featureCollectionScan.log && \

    ln -s /dev/stdout ./content/thredds/logs/fmrc.log && \

    ln -s /dev/stdout ./content/thredds/logs/threddsServlet.log && \

    ln -s /dev/stdout ./content/thredds/logs/cache.log && \

# Create symlinks for log files to stdout

RUN mkdir -p ./content/thredds/cache && \

    chown -R $ESGF_USER:$ESGF_GROUP ./content/thredds && \

    chmod -R u+w,g+w,o= ./content/thredds

    chmod -R u+w,g+w,o= ./content/thredds && \

    ln -s /dev/stdout ./logs/serverStartup.log && \

    ln -s /dev/stdout ./logs/catalogInit.log && \

    ln -s /dev/stdout ./logs/httpout.log && \

    ln -s /dev/stdout ./logs/featureCollectionScan.log && \

    ln -s /dev/stdout ./logs/fmrc.log && \

    ln -s /dev/stdout ./logs/threddsServlet.log && \

    ln -s /dev/stdout ./logs/cache.log

ENV CATALINA_EXTRA_OPTS "-Dtds.content.root.path=$CATALINA_HOME/content"

VOLUME ./content/thredds/cache

images/thredds/log4j2.xml

+5 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<configuration monitorInterval="30">

  <properties>

    <property name="tds.content.root.path">../content</property>

    <property name="tds.log.dir">${sys:tds.content.root.path}/thredds/logs</property>

    <!--

      Use the tomcat logs directory rather than a THREDDS one as it makes configuring the

      log redirection pipes easier in the Helm chart

    -->

    <property name="tds.log.dir">/opt/tomcat/logs</property>

  </properties>



  <Appenders>

images/tomcat/server.xml

+1 −2
Original line number Diff line number Diff line
@@ -173,8 +173,7 @@ 
        <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"

               prefix="localhost_access_log" suffix=".txt"

               pattern="combined"

               renameOnRotate="true"

               rotateable="false"

               rotatable="false"

        />



      </Host>