mirror of
https://github.com/corda/corda.git
synced 2024-12-24 07:06:44 +00:00
Merged in parkri-fix-jolokia-access-warning (pull request #491)
Move jolokia access config to the config directories, alongside log4j2.xml file. Point samples at top level dev and test config.
This commit is contained in:
Rick Parker
commit
17c8f4389f
30
config/dev/jolokia-access.xml
Normal file
30
config/dev/jolokia-access.xml
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<restrict>
|
||||||
|
<http>
|
||||||
|
<method>post</method>
|
||||||
|
<method>get</method>
|
||||||
|
</http>
|
||||||
|
|
||||||
|
<commands>
|
||||||
|
<command>read</command>
|
||||||
|
<command>list</command>
|
||||||
|
</commands>
|
||||||
|
|
||||||
|
<!-- allow anyone to force a garbage collection -->
|
||||||
|
<allow>
|
||||||
|
<mbean>
|
||||||
|
<name>java.lang:type=Memory</name>
|
||||||
|
<operation>gc</operation>
|
||||||
|
</mbean>
|
||||||
|
</allow>
|
||||||
|
|
||||||
|
<!-- in case we ever end up using c3pio connection pooling, this example from the docs prevents the password being exported -->
|
||||||
|
<deny>
|
||||||
|
<mbean>
|
||||||
|
<name>com.mchange.v2.c3p0:type=PooledDataSource,*</name>
|
||||||
|
<attribute>properties</attribute>
|
||||||
|
</mbean>
|
||||||
|
</deny>
|
||||||
|
|
||||||
|
</restrict>
|
||||||
@ -35,12 +35,12 @@ repositories {
|
|||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
resources {
|
resources {
|
||||||
srcDir "config/dev"
|
srcDir "../../config/dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
test {
|
test {
|
||||||
resources {
|
resources {
|
||||||
srcDir "config/test"
|
srcDir "../../config/test"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
integrationTest {
|
integrationTest {
|
||||||
|
|||||||
@ -1,59 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Configuration status="info">
|
|
||||||
|
|
||||||
<Properties>
|
|
||||||
<Property name="log-path">logs</Property>
|
|
||||||
<Property name="log-name">node-${hostName}</Property>
|
|
||||||
<Property name="archive">${log-path}/archive</Property>
|
|
||||||
</Properties>
|
|
||||||
|
|
||||||
<ThresholdFilter level="trace"/>
|
|
||||||
|
|
||||||
<Appenders>
|
|
||||||
<Console name="Console-Appender" target="SYSTEM_OUT">
|
|
||||||
<PatternLayout>
|
|
||||||
<pattern>
|
|
||||||
%highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
|
|
||||||
</pattern>>
|
|
||||||
</PatternLayout>
|
|
||||||
</Console>
|
|
||||||
|
|
||||||
<!-- Will generate up to 10 log files for a given day. During every rollover it will delete
|
|
||||||
those that are older than 60 days, but keep the most recent 10 GB -->
|
|
||||||
<RollingFile name="RollingFile-Appender"
|
|
||||||
fileName="${log-path}/${log-name}.log"
|
|
||||||
filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
|
|
||||||
|
|
||||||
<PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{1} - %msg%n"/>
|
|
||||||
|
|
||||||
<Policies>
|
|
||||||
<TimeBasedTriggeringPolicy/>
|
|
||||||
<SizeBasedTriggeringPolicy size="10MB"/>
|
|
||||||
</Policies>
|
|
||||||
|
|
||||||
<DefaultRolloverStrategy min="1" max="10">
|
|
||||||
<Delete basePath="${archive}" maxDepth="1">
|
|
||||||
<IfFileName glob="${log-name}*.log.gz"/>
|
|
||||||
<IfLastModified age="60d">
|
|
||||||
<IfAny>
|
|
||||||
<IfAccumulatedFileSize exceeds="10 GB"/>
|
|
||||||
</IfAny>
|
|
||||||
</IfLastModified>
|
|
||||||
</Delete>
|
|
||||||
</DefaultRolloverStrategy>
|
|
||||||
|
|
||||||
</RollingFile>
|
|
||||||
</Appenders>
|
|
||||||
|
|
||||||
<Loggers>
|
|
||||||
<Root level="info">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
<AppenderRef ref="RollingFile-Appender"/>
|
|
||||||
</Root>
|
|
||||||
<Logger name="com.r3corda" level="info" additivity="false">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
<AppenderRef ref="RollingFile-Appender"/>
|
|
||||||
</Logger>
|
|
||||||
</Loggers>
|
|
||||||
|
|
||||||
</Configuration>
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Configuration status="info">
|
|
||||||
<Appenders>
|
|
||||||
<Console name="Console-Appender" target="SYSTEM_OUT">
|
|
||||||
<PatternLayout>
|
|
||||||
<pattern>
|
|
||||||
[%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
|
|
||||||
</pattern>>
|
|
||||||
</PatternLayout>
|
|
||||||
</Console>
|
|
||||||
</Appenders>
|
|
||||||
<Loggers>
|
|
||||||
<Root level="info">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
</Root>
|
|
||||||
<Logger name="com.r3corda" level="info" additivity="false">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
</Logger>
|
|
||||||
</Loggers>
|
|
||||||
</Configuration>
|
|
||||||
@ -33,12 +33,12 @@ repositories {
|
|||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
resources {
|
resources {
|
||||||
srcDir "config/dev"
|
srcDir "../../config/dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
test {
|
test {
|
||||||
resources {
|
resources {
|
||||||
srcDir "config/test"
|
srcDir "../../config/test"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
integrationTest {
|
integrationTest {
|
||||||
|
|||||||
@ -1,59 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Configuration status="info">
|
|
||||||
|
|
||||||
<Properties>
|
|
||||||
<Property name="log-path">logs</Property>
|
|
||||||
<Property name="log-name">node-${hostName}</Property>
|
|
||||||
<Property name="archive">${log-path}/archive</Property>
|
|
||||||
</Properties>
|
|
||||||
|
|
||||||
<ThresholdFilter level="trace"/>
|
|
||||||
|
|
||||||
<Appenders>
|
|
||||||
<Console name="Console-Appender" target="SYSTEM_OUT">
|
|
||||||
<PatternLayout>
|
|
||||||
<pattern>
|
|
||||||
%highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
|
|
||||||
</pattern>>
|
|
||||||
</PatternLayout>
|
|
||||||
</Console>
|
|
||||||
|
|
||||||
<!-- Will generate up to 10 log files for a given day. During every rollover it will delete
|
|
||||||
those that are older than 60 days, but keep the most recent 10 GB -->
|
|
||||||
<RollingFile name="RollingFile-Appender"
|
|
||||||
fileName="${log-path}/${log-name}.log"
|
|
||||||
filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
|
|
||||||
|
|
||||||
<PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{1} - %msg%n"/>
|
|
||||||
|
|
||||||
<Policies>
|
|
||||||
<TimeBasedTriggeringPolicy/>
|
|
||||||
<SizeBasedTriggeringPolicy size="10MB"/>
|
|
||||||
</Policies>
|
|
||||||
|
|
||||||
<DefaultRolloverStrategy min="1" max="10">
|
|
||||||
<Delete basePath="${archive}" maxDepth="1">
|
|
||||||
<IfFileName glob="${log-name}*.log.gz"/>
|
|
||||||
<IfLastModified age="60d">
|
|
||||||
<IfAny>
|
|
||||||
<IfAccumulatedFileSize exceeds="10 GB"/>
|
|
||||||
</IfAny>
|
|
||||||
</IfLastModified>
|
|
||||||
</Delete>
|
|
||||||
</DefaultRolloverStrategy>
|
|
||||||
|
|
||||||
</RollingFile>
|
|
||||||
</Appenders>
|
|
||||||
|
|
||||||
<Loggers>
|
|
||||||
<Root level="info">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
<AppenderRef ref="RollingFile-Appender"/>
|
|
||||||
</Root>
|
|
||||||
<Logger name="net.corda" level="info" additivity="false">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
<AppenderRef ref="RollingFile-Appender"/>
|
|
||||||
</Logger>
|
|
||||||
</Loggers>
|
|
||||||
|
|
||||||
</Configuration>
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Configuration status="info">
|
|
||||||
<Appenders>
|
|
||||||
<Console name="Console-Appender" target="SYSTEM_OUT">
|
|
||||||
<PatternLayout>
|
|
||||||
<pattern>
|
|
||||||
[%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
|
|
||||||
</pattern>>
|
|
||||||
</PatternLayout>
|
|
||||||
</Console>
|
|
||||||
</Appenders>
|
|
||||||
<Loggers>
|
|
||||||
<Root level="info">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
</Root>
|
|
||||||
<Logger name="net.corda" level="info" additivity="false">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
</Logger>
|
|
||||||
</Loggers>
|
|
||||||
</Configuration>
|
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<restrict>
|
||||||
|
<http>
|
||||||
|
<method>post</method>
|
||||||
|
<method>get</method>
|
||||||
|
</http>
|
||||||
|
|
||||||
|
<commands>
|
||||||
|
<command>read</command>
|
||||||
|
<command>list</command>
|
||||||
|
</commands>
|
||||||
|
|
||||||
|
<!-- allow anyone to force a garbage collection -->
|
||||||
|
<allow>
|
||||||
|
<mbean>
|
||||||
|
<name>java.lang:type=Memory</name>
|
||||||
|
<operation>gc</operation>
|
||||||
|
</mbean>
|
||||||
|
</allow>
|
||||||
|
|
||||||
|
<!-- in case we ever end up using c3pio connection pooling, this example from the docs prevents the password being exported -->
|
||||||
|
<deny>
|
||||||
|
<mbean>
|
||||||
|
<name>com.mchange.v2.c3p0:type=PooledDataSource,*</name>
|
||||||
|
<attribute>properties</attribute>
|
||||||
|
</mbean>
|
||||||
|
</deny>
|
||||||
|
|
||||||
|
</restrict>
|
||||||
@ -33,12 +33,12 @@ repositories {
|
|||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
resources {
|
resources {
|
||||||
srcDir "config/dev"
|
srcDir "../../config/dev"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
test {
|
test {
|
||||||
resources {
|
resources {
|
||||||
srcDir "config/test"
|
srcDir "../../config/test"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
integrationTest {
|
integrationTest {
|
||||||
|
|||||||
@ -1,59 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Configuration status="info">
|
|
||||||
|
|
||||||
<Properties>
|
|
||||||
<Property name="log-path">logs</Property>
|
|
||||||
<Property name="log-name">node-${hostName}</Property>
|
|
||||||
<Property name="archive">${log-path}/archive</Property>
|
|
||||||
</Properties>
|
|
||||||
|
|
||||||
<ThresholdFilter level="trace"/>
|
|
||||||
|
|
||||||
<Appenders>
|
|
||||||
<Console name="Console-Appender" target="SYSTEM_OUT">
|
|
||||||
<PatternLayout>
|
|
||||||
<pattern>
|
|
||||||
%highlight{%level{length=1} %d{HH:mm:ss} %T %c{1}.%M - %msg%n}{INFO=white,WARN=red,FATAL=bright red blink}
|
|
||||||
</pattern>>
|
|
||||||
</PatternLayout>
|
|
||||||
</Console>
|
|
||||||
|
|
||||||
<!-- Will generate up to 10 log files for a given day. During every rollover it will delete
|
|
||||||
those that are older than 60 days, but keep the most recent 10 GB -->
|
|
||||||
<RollingFile name="RollingFile-Appender"
|
|
||||||
fileName="${log-path}/${log-name}.log"
|
|
||||||
filePattern="${archive}/${log-name}.%d{yyyy-MM-dd}-%i.log.gz">
|
|
||||||
|
|
||||||
<PatternLayout pattern="[%-5level] %d{ISO8601}{GMT+0} [%t] %c{1} - %msg%n"/>
|
|
||||||
|
|
||||||
<Policies>
|
|
||||||
<TimeBasedTriggeringPolicy/>
|
|
||||||
<SizeBasedTriggeringPolicy size="10MB"/>
|
|
||||||
</Policies>
|
|
||||||
|
|
||||||
<DefaultRolloverStrategy min="1" max="10">
|
|
||||||
<Delete basePath="${archive}" maxDepth="1">
|
|
||||||
<IfFileName glob="${log-name}*.log.gz"/>
|
|
||||||
<IfLastModified age="60d">
|
|
||||||
<IfAny>
|
|
||||||
<IfAccumulatedFileSize exceeds="10 GB"/>
|
|
||||||
</IfAny>
|
|
||||||
</IfLastModified>
|
|
||||||
</Delete>
|
|
||||||
</DefaultRolloverStrategy>
|
|
||||||
|
|
||||||
</RollingFile>
|
|
||||||
</Appenders>
|
|
||||||
|
|
||||||
<Loggers>
|
|
||||||
<Root level="info">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
<AppenderRef ref="RollingFile-Appender"/>
|
|
||||||
</Root>
|
|
||||||
<Logger name="com.r3corda" level="info" additivity="false">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
<AppenderRef ref="RollingFile-Appender"/>
|
|
||||||
</Logger>
|
|
||||||
</Loggers>
|
|
||||||
|
|
||||||
</Configuration>
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<Configuration status="info">
|
|
||||||
<Appenders>
|
|
||||||
<Console name="Console-Appender" target="SYSTEM_OUT">
|
|
||||||
<PatternLayout>
|
|
||||||
<pattern>
|
|
||||||
[%-5level] %d{HH:mm:ss.SSS} [%t] %c{1}.%M - %msg%n
|
|
||||||
</pattern>>
|
|
||||||
</PatternLayout>
|
|
||||||
</Console>
|
|
||||||
</Appenders>
|
|
||||||
<Loggers>
|
|
||||||
<Root level="info">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
</Root>
|
|
||||||
<Logger name="com.r3corda" level="info" additivity="false">
|
|
||||||
<AppenderRef ref="Console-Appender"/>
|
|
||||||
</Logger>
|
|
||||||
</Loggers>
|
|
||||||
</Configuration>
|
|
||||||
Loading…
Reference in New Issue
Block a user