Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: docker/shib-idp-conftree
base: 4.1-InCommon
Choose a base ref
...
head repository: docker/shib-idp-conftree
compare: 3.4-default
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 5 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 5, 2019

  1. set logback to default

    @pcaskey
    pcaskey committed Oct 5, 2019
    Copy the full SHA
    80ad667 View commit details

  2. fix logback

    @pcaskey
    pcaskey committed Oct 5, 2019
    Copy the full SHA
    70e6355 View commit details

  3. logback

    @pcaskey
    pcaskey committed Oct 5, 2019
    Copy the full SHA
    24adae6 View commit details

  4. logback again

    @pcaskey
    pcaskey committed Oct 5, 2019
    Copy the full SHA
    3d05f1a View commit details

  5. logback

    @pcaskey
    pcaskey committed Oct 5, 2019
    Copy the full SHA
    13f38e5 View commit details
Showing with 26 additions and 393 deletions.
  1. +26 −9 conf/logback.xml
  2. +0 −192 conf/logback.xml.dist
  3. +0 −192 conf/logback.xml.tmp3
35 changes: 26 additions & 9 deletions conf/logback.xml
View file
@@ -72,9 +72,13 @@
<!-- =========================================================== -->

<!-- Process log. -->
<appender name="IDP_PROCESS" class="ch.qos.logback.core.FileAppender">
<File>/tmp/logidp-process</File>
<appender name="IDP_PROCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>${idp.logfiles}/idp-process.log</File>

<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${idp.logfiles}/idp-process-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>${idp.loghistory}</maxHistory>
</rollingPolicy>

<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<charset>UTF-8</charset>
@@ -99,14 +103,18 @@
<discardingThreshold>0</discardingThreshold>
</appender>

<appender name="IDP_WARN" class="ch.qos.logback.core.FileAppender">
<appender name="IDP_WARN" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- Suppress anything below WARN. -->
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level>
</filter>

<File>/tmp/logidp-warn</File>
<File>${idp.logfiles}/idp-warn.log</File>

<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${idp.logfiles}/idp-warn-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>${idp.loghistory}</maxHistory>
</rollingPolicy>

<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<charset>UTF-8</charset>
@@ -127,9 +135,13 @@
</appender>

<!-- Audit log. -->
<appender name="IDP_AUDIT" class="ch.qos.logback.core.FileAppender">
<File>/tmp/logidp-audit</File>
<appender name="IDP_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>${idp.logfiles}/idp-audit.log</File>

<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${idp.logfiles}/idp-audit-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>${idp.loghistory}</maxHistory>
</rollingPolicy>

<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<charset>UTF-8</charset>
@@ -138,9 +150,13 @@
</appender>

<!-- Consent audit log. -->
<appender name="IDP_CONSENT_AUDIT" class="ch.qos.logback.core.FileAppender">
<File>/tmp/logidp-consent-audit</File>
<appender name="IDP_CONSENT_AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>${idp.logfiles}/idp-consent-audit.log</File>

<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${idp.logfiles}/idp-consent-audit-%d{yyyy-MM-dd}.log.gz</fileNamePattern>
<maxHistory>${idp.loghistory}</maxHistory>
</rollingPolicy>

<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<charset>UTF-8</charset>
@@ -173,4 +189,5 @@
<appender-ref ref="${idp.warn.appender:-IDP_WARN}" />
</root>

</configuration>
</configuration>

192 changes: 0 additions & 192 deletions conf/logback.xml.dist
View file

This file was deleted.