-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6420ab1
commit 7ecc484
Showing
36 changed files
with
702 additions
and
153 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,7 @@ | ||
| [template] | ||
| src = "log4j.properties.tmpl" | ||
| dest = "/opt/activemq/conf/log4j.properties" | ||
| uid = 100 | ||
| gid = 1000 | ||
| mode = "0640" | ||
| keys = [ "/" ] |
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,67 @@ | ||
| ## --------------------------------------------------------------------------- | ||
| ## Licensed to the Apache Software Foundation (ASF) under one or more | ||
| ## contributor license agreements. See the NOTICE file distributed with | ||
| ## this work for additional information regarding copyright ownership. | ||
| ## The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| ## (the "License"); you may not use this file except in compliance with | ||
| ## the License. You may obtain a copy of the License at | ||
| ## | ||
| ## http://www.apache.org/licenses/LICENSE-2.0 | ||
| ## | ||
| ## Unless required by applicable law or agreed to in writing, software | ||
| ## distributed under the License is distributed on an "AS IS" BASIS, | ||
| ## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ## See the License for the specific language governing permissions and | ||
| ## limitations under the License. | ||
| ## --------------------------------------------------------------------------- | ||
|
|
||
| # | ||
| # This file controls most of the logging in ActiveMQ which is mainly based around | ||
| # the commons logging API. | ||
| # | ||
| log4j.rootLogger={{ getenv "ACTIVEMQ_LOG_LEVEL" }}, console | ||
| log4j.logger.org.apache.activemq.spring=WARN | ||
| log4j.logger.org.apache.activemq.web.handler=WARN | ||
| log4j.logger.org.springframework=WARN | ||
| log4j.logger.org.apache.xbean=WARN | ||
| log4j.logger.org.apache.camel=INFO | ||
| log4j.logger.org.eclipse.jetty=WARN | ||
|
|
||
| # When debugging or reporting problems to the ActiveMQ team, | ||
| # comment out the above lines and uncomment the next. | ||
|
|
||
| #log4j.rootLogger=DEBUG, logfile, console | ||
|
|
||
| # Or for more fine grained debug logging uncomment one of these | ||
| #log4j.logger.org.apache.activemq=DEBUG | ||
| #log4j.logger.org.apache.camel=DEBUG | ||
|
|
||
| # Console appender | ||
| log4j.appender.console=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.console.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.console.layout.ConversionPattern=%d | %-5p | %m | %c | %t%n | ||
| log4j.appender.console.threshold={{ getenv "ACTIVEMQ_LOG_LEVEL" }} | ||
|
|
||
| # use some of the following patterns to see MDC logging data | ||
| # | ||
| # %X{activemq.broker} | ||
| # %X{activemq.connector} | ||
| # %X{activemq.destination} | ||
| # | ||
| # e.g. | ||
| # | ||
| # log4j.appender.logfile.layout.ConversionPattern=%d | %-20.20X{activemq.connector} | %-5p | %m | %c | %t%n | ||
|
|
||
| log4j.throwableRenderer=org.apache.log4j.EnhancedThrowableRenderer | ||
|
|
||
| ########### | ||
| # Audit log | ||
| ########### | ||
|
|
||
| log4j.additivity.org.apache.activemq.audit=false | ||
| log4j.logger.org.apache.activemq.audit={{ getenv "ACTIVEMQ_AUDIT_LOG_LEVEL" }}, audit | ||
|
|
||
| log4j.appender.audit=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.audit.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.audit.layout.ConversionPattern=%d | %-5p | %m | %t%n | ||
| log4j.appender.audit.threshold={{ getenv "ACTIVEMQ_AUDIT_LOG_LEVEL" }} |
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 |
|---|---|---|
| @@ -1,13 +1,6 @@ | ||
| #!/usr/bin/with-contenv bash | ||
| set -e | ||
|
|
||
| # Change log files to redirect to stdout/stderr | ||
| ln -sf /dev/stdout /opt/activemq/data/activemq.log | ||
| chown activemq:activemq /opt/activemq/data/activemq.log | ||
|
|
||
| ln -sf /dev/stdout /opt/activemq/data/audit.log | ||
| chown activemq:activemq /opt/activemq/data/audit.log | ||
|
|
||
| # When bind mounting we need to ensure that we | ||
| # actually can write to the folder. | ||
| chown activemq:activemq /opt/activemq/data |
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
26 changes: 5 additions & 21 deletions
26
alpaca/rootfs/etc/confd/templates/org.ops4j.pax.logging.cfg.tmpl
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 |
|---|---|---|
| @@ -1,34 +1,18 @@ | ||
| # Root logger | ||
| log4j.rootLogger={{ getenv "ALPACA_LOGGER_ROOT_LEVEL" }}, out, osgi:* | ||
| log4j.throwableRenderer=org.apache.log4j.OsgiThrowableRenderer | ||
|
|
||
| # File appender | ||
| log4j.appender.out=org.apache.log4j.RollingFileAppender | ||
| log4j.appender.out=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.out.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.out.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n | ||
| log4j.appender.out.file=${karaf.data}/log/karaf.log | ||
| log4j.appender.out.append=true | ||
| log4j.appender.out.maxFileSize=1MB | ||
| log4j.appender.out.maxBackupIndex=10 | ||
|
|
||
| # Camel Logger | ||
| log4j.appender.camel=org.apache.log4j.RollingFileAppender | ||
| log4j.logger.org.apache.camel={{ getenv "ALPACA_LOGGER_CAMEL_LEVEL" }}, camel | ||
| log4j.appender.camel=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.camel.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.camel.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n | ||
| log4j.appender.camel.file=${karaf.data}/log/camel.log | ||
| log4j.appender.camel.append=false | ||
| log4j.appender.camel.maxFileSize=1MB | ||
| log4j.appender.camel.maxBackupIndex=10 | ||
|
|
||
| log4j.logger.org.apache.camel={{ getenv "ALPACA_LOGGER_CAMEL_LEVEL" }}, camel | ||
|
|
||
| # Islandora Logger | ||
| log4j.appender.islandora=org.apache.log4j.RollingFileAppender | ||
| log4j.logger.ca.islandora.camel={{ getenv "ALPACA_LOGGER_ISLANDORA_LEVEL" }}, islandora | ||
| log4j.appender.islandora=org.apache.log4j.ConsoleAppender | ||
| log4j.appender.islandora.layout=org.apache.log4j.PatternLayout | ||
| log4j.appender.islandora.layout.ConversionPattern=%d{ISO8601} | %-5.5p | %-16.16t | %-32.32c{1} | %X{bundle.id} - %X{bundle.name} - %X{bundle.version} | %m%n | ||
| log4j.appender.islandora.file=${karaf.data}/log/islandora.log | ||
| log4j.appender.islandora.append=false | ||
| log4j.appender.islandora.maxFileSize=1MB | ||
| log4j.appender.islandora.maxBackupIndex=10 | ||
|
|
||
| log4j.logger.ca.islandora.camel={{ getenv "ALPACA_LOGGER_ISLANDORA_LEVEL" }}, islandora |
This file was deleted.
Oops, something went wrong.
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,17 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
|
|
||
| # If the container is started without allocating a tty, i.e. without `-t`. | ||
| # It can cause issues for non-root processes that want to write directly to | ||
| # standard out. | ||
| # | ||
| # If a tty is allocated /dev/stdout will indirectly point to it /dev/pts/0. | ||
| # This file allows members of the tty group to write to it. | ||
| # | ||
| # If no tty is allocated /dev/stdout will point to /proc/self/fd/1 which | ||
| # will be a pipe to the hosts users active terminal. This pipe is owned | ||
| # root with read/write access only permitted to the root user. | ||
| # | ||
| # To permit the containers to be started without `tty` we allow all users | ||
| # to read/write to the stdout,stderr,stdin pipes. | ||
| chmod o+rw /dev/std{in,out,err} |
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 |
|---|---|---|
| @@ -1,22 +1,6 @@ | ||
| #!/usr/bin/with-contenv bash | ||
| set -e | ||
|
|
||
| # Change log files to redirect to stdout/stderr | ||
| ln -sf /dev/stdout /opt/tomcat/logs/rules.log | ||
| chown tomcat:tomcat /opt/tomcat/logs/rules.log | ||
|
|
||
| ln -sf /dev/stdout /opt/tomcat/logs/queryLog.csv | ||
| chown tomcat:tomcat /dev/stdout /opt/tomcat/logs/queryLog.csv | ||
|
|
||
| ln -sf /dev/stdout /opt/tomcat/logs/queryRunState.log | ||
| chown tomcat:tomcat /dev/stdout /opt/tomcat/logs/queryRunState.log | ||
|
|
||
| ln -sf /dev/stdout /opt/tomcat/logs/solutions.csv | ||
| chown tomcat:tomcat /dev/stdout /opt/tomcat/logs/solutions.csv | ||
|
|
||
| ln -sf /dev/stdout /opt/tomcat/logs/sparql.txt | ||
| chown tomcat:tomcat /dev/stdout /opt/tomcat/logs/sparql.txt | ||
|
|
||
| # When bind mounting we need to ensure that we | ||
| # actually can write to the folder. | ||
| chown tomcat:tomcat /data |
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
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
Oops, something went wrong.