Skip to content

Commit 058bfdf

Browse files
cdausmuscdausmus
committed
Merge branch 'release/6.1.6'
2 parents da9f870 + a3e17a1 commit 058bfdf

File tree

6 files changed

+143
-197
lines changed

6 files changed

+143
-197
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ branches:
77
only:
88
- master
99
- develop
10-
- feature/grails-5-upgrade
10+
- feature/dg-101
1111
services:
1212
- postgresql
1313
addons:

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ plugins {
2424
id "com.dorongold.task-tree" version "2.1.1"
2525
}
2626

27-
version "6.1.5"
27+
version "6.1.6"
2828
group "au.org.ala"
2929
description "Digivol application"
3030

‎grails-app/conf/logback.xml

+23-134
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,32 @@
44
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
55

66
<variable name="loggingDir" value="${catalina.base:-./logs}" />
7-
<!-- <variable name="loggingDir" value="${LOGGING_DIR:-/tmp/}" />-->
87
<variable name="appName" value="digivol" />
98

109
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
1110
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
12-
<evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
11+
<evaluator>
1312
<expression>return logger.equals("org.grails.plugins.rx.web.RxResultSubscriber") &amp;&amp; message.contains("Async Dispatch Error: Broken pipe");</expression>
1413
</evaluator>
1514
<OnMismatch>NEUTRAL</OnMismatch>
1615
<OnMatch>DENY</OnMatch>
1716
</filter>
18-
<!-- <filter class="ch.qos.logback.core.filter.EvaluatorFilter">-->
19-
<!-- <evaluator> &lt;!&ndash; defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator &ndash;&gt;-->
20-
<!-- <expression>return logger.equals("org.elasticsearch.cluster.routing.allocation.decider");</expression>-->
21-
<!-- </evaluator>-->
22-
<!-- <OnMismatch>ACCEPT</OnMismatch>-->
23-
<!-- <OnMatch>DENY</OnMatch>-->
24-
<!-- </filter>-->
25-
<!-- encoders are assigned the type
26-
ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
17+
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
18+
<evaluator>
19+
<expression>return logger.equals("org.elasticsearch.cluster.routing.allocation.decider");</expression>
20+
</evaluator>
21+
<OnMismatch>ACCEPT</OnMismatch>
22+
<OnMatch>DENY</OnMatch>
23+
</filter>
2724
<encoder>
2825
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{39} : %m%n%wex</pattern>
2926
</encoder>
3027
</appender>
3128

29+
<!--
3230
<appender name="TOMCAT_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
3331
<filter class="ch.qos.logback.core.filter.EvaluatorFilter">
34-
<evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
32+
<evaluator>
3533
<expression>return logger.equals("org.grails.plugins.rx.web.RxResultSubscriber") &amp;&amp; message.contains("Async Dispatch Error: Broken pipe");</expression>
3634
</evaluator>
3735
<OnMismatch>NEUTRAL</OnMismatch>
@@ -49,149 +47,40 @@
4947
</triggeringPolicy>
5048
<encoder>
5149
<charset>UTF-8</charset>
52-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{39} : %m%n%wex</pattern>
53-
<!-- <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>-->
54-
</encoder>
55-
</appender>
56-
57-
<appender name="ACCESS" class="ch.qos.logback.core.rolling.RollingFileAppender">
58-
59-
<file>${loggingDir}/${appName}-session-access.log</file>
60-
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
61-
<fileNamePattern>${loggingDir}/${appName}-session-access.%i.log.gz</fileNamePattern>
62-
<minIndex>1</minIndex>
63-
<maxIndex>4</maxIndex>
64-
</rollingPolicy>
65-
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
66-
<maxFileSize>10MB</maxFileSize>
67-
</triggeringPolicy>
68-
<encoder>
69-
<charset>UTF-8</charset>
70-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{39} : %m%n%wex</pattern>
71-
<!-- <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>-->
72-
</encoder>
73-
</appender>
74-
75-
<appender name="CAS" class="ch.qos.logback.core.rolling.RollingFileAppender">
76-
77-
<file>${loggingDir}/${appName}-cas.log</file>
78-
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
79-
<fileNamePattern>${loggingDir}/${appName}-cas.%i.log.gz</fileNamePattern>
80-
<minIndex>1</minIndex>
81-
<maxIndex>4</maxIndex>
82-
</rollingPolicy>
83-
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
84-
<maxFileSize>10MB</maxFileSize>
85-
</triggeringPolicy>
86-
<encoder>
87-
<charset>UTF-8</charset>
88-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{39} : %m%n%wex</pattern>
89-
<!-- <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>-->
50+
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p - [%15.15t] %-40.40logger{39} : %m%n%wex</pattern>
9051
</encoder>
9152
</appender>
92-
93-
<appender name="DEBUG_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
94-
95-
<file>${loggingDir}/${appName}-debug.log</file>
96-
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
97-
<fileNamePattern>${loggingDir}/${appName}-debug.%i.log.gz</fileNamePattern>
98-
<minIndex>1</minIndex>
99-
<maxIndex>4</maxIndex>
100-
</rollingPolicy>
101-
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
102-
<maxFileSize>10MB</maxFileSize>
103-
</triggeringPolicy>
104-
<encoder>
105-
<charset>UTF-8</charset>
106-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{39} : %m%n%wex</pattern>
107-
<!-- <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>-->
108-
</encoder>
109-
</appender>
110-
111-
<appender name="QUERY_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
112-
113-
<file>${loggingDir}/${appName}-slow-queries.log</file>
114-
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
115-
<fileNamePattern>${loggingDir}/${appName}-slow-queries.%i.log.gz</fileNamePattern>
116-
<minIndex>1</minIndex>
117-
<maxIndex>4</maxIndex>
118-
</rollingPolicy>
119-
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
120-
<maxFileSize>10MB</maxFileSize>
121-
</triggeringPolicy>
122-
<encoder>
123-
<charset>UTF-8</charset>
124-
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %5p --- [%15.15t] %-40.40logger{39} : %m%n%wex</pattern>
125-
<!-- <pattern>%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%5p) %clr(-&#45;&#45;){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n%wex</pattern>-->
126-
</encoder>
127-
</appender>
128-
129-
<!-- Ancilliary logs -->
130-
131-
<!-- Web Access Logs -->
132-
<logger name="au.org.ala.volunteer.BVPServletFilter" level="INFO" additivity="false">
133-
<appender-ref ref="ACCESS"/>
134-
</logger>
135-
<logger name="au.org.ala.volunteer.BVPSessionListener" level="DEBUG" additivity="false">
136-
<appender-ref ref="ACCESS"/>
137-
</logger>
138-
139-
<!-- CAS session logs -->
140-
<logger name="au.org.ala.cas" level="DEBUG" additivity="false">
141-
<appender-ref ref="CAS"/>
142-
</logger>
143-
<logger name="org.jasig.cas" level="DEBUG" additivity="false">
144-
<appender-ref ref="CAS"/>
145-
</logger>
53+
-->
14654

14755
<!-- Debug Logs -->
56+
<!--
14857
<logger name="au.org.ala.volunteer.Task" level="DEBUG" additivity="false">
14958
<appender-ref ref="DEBUG_LOG"/>
15059
</logger>
151-
<logger name="au.org.ala.volunteer.TaskService" level="DEBUG" additivity="false">
152-
<appender-ref ref="DEBUG_LOG"/>
153-
</logger>
154-
<logger name="au.org.ala.volunteer.TaskLoadService" level="DEBUG" additivity="false">
155-
<appender-ref ref="DEBUG_LOG"/>
156-
</logger>
157-
<logger name="au.org.ala.volunteer.TaskIngestJob" level="INFO" additivity="false">
158-
<appender-ref ref="DEBUG_LOG"/>
159-
</logger>
160-
<logger name="au.org.ala.volunteer.ValidationService" level="DEBUG" additivity="false">
161-
<appender-ref ref="DEBUG_LOG"/>
162-
</logger>
163-
<logger name="au.org.ala.volunteer.TranscribeController" level="DEBUG" additivity="false">
164-
<appender-ref ref="DEBUG_LOG"/>
165-
</logger>
166-
<logger name="au.org.ala.volunteer.ValidateController" level="DEBUG" additivity="false">
167-
<appender-ref ref="DEBUG_LOG"/>
168-
</logger>
169-
170-
<!-- Slow queries -->
171-
<logger name="org.apache.tomcat.jdbc.pool.interceptor.SlowQueryReport" level="INFO" additivity="false">
172-
<appender-ref ref="QUERY_LOG"/>
173-
</logger>
60+
-->
17461

17562
<logger name="org.hibernate.orm.deprecation" level="ERROR" />
176-
63+
<logger name="org.grails.config.NavigableMap" level="ERROR" />
64+
<logger name="grails.spring.BeanBuilder" level="ERROR" />
65+
<logger name="grails.plugin.cache.web.filter" level="ERROR" />
17766
<logger name="au.org.ala.cas.client" level="WARN" />
178-
<logger name="au.org.ala.cas.util" level="WARN" />
17967
<logger name="org.apache.coyote.http11.Http11Processor" level="WARN" />
180-
18168
<logger name="asset.pipeline" level="INFO" />
182-
<logger name="au.org.ala" level="INFO" />
183-
<logger name="grails.app" level="INFO" />
18469
<logger name="grails.plugins.mail" level="INFO" />
18570
<logger name="grails.plugins.quartz" level="INFO" />
71+
<logger name="grails.plugin.cache" level="INFO" />
18672
<logger name="org.hibernate" level="INFO" />
18773
<logger name="org.hibernate.SQL" level="INFO" />
18874
<logger name="org.quartz" level="INFO" />
18975
<logger name="org.springframework" level="INFO" />
190-
<logger name="org.flywaydb" level="INFO" />
76+
<logger name="org.flywaydb" level="TRACE" />
77+
<logger name="grails.plugin.externalconfig.ExternalConfig" level="INFO" />
19178
<logger name="au.org.ala.volunteer.DomainUpdateService" level="INFO" />
79+
<logger name="au.org.ala" level="INFO" />
80+
<logger name="au.org.ala.volunteer" level="INFO" />
19281

19382
<root level="INFO">
19483
<appender-ref ref="STDOUT" />
195-
<appender-ref ref="TOMCAT_LOG" />
84+
<!-- <appender-ref ref="TOMCAT_LOG" /> -->
19685
</root>
19786
</configuration>

‎grails-app/services/au/org/ala/volunteer/FullTextIndexService.groovy

+21-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@ class FullTextIndexService {
5151
def initialize() {
5252
log.info("ElasticSearch service starting...")
5353
Settings.Builder settings = Settings.builder()
54-
settings.put("path.home", grailsApplication.config.getProperty('elasticsearch.location', String) as String)
54+
def settingsMap = getSettings()
55+
settingsMap.each { element, value ->
56+
log.debug("Elastic Search init setting: [${element}], Value: [${value}]")
57+
settings.put(element, value as String)
58+
}
59+
5560
node = nodeBuilder().local(true).settings(settings).node()
5661
client = node.client()
5762
client.admin().cluster().prepareHealth().setWaitForYellowStatus().execute().actionGet()
@@ -79,6 +84,21 @@ class FullTextIndexService {
7984
addMappings()
8085
}
8186

87+
@NotTransactional
88+
def getSettings() {
89+
def settings = [:]
90+
settings["path.home"] = grailsApplication.config.getProperty('elasticsearch.location', String)
91+
def watermarkLow = grailsApplication.config.getProperty('elasticsearch.cluster.routing.allocation.disk.watermark.low', String) as String
92+
if (watermarkLow) {
93+
settings["cluster.routing.allocation.disk.watermark.low"] = watermarkLow
94+
}
95+
def watermarkHigh = grailsApplication.config.getProperty('elasticsearch.cluster.routing.allocation.disk.watermark.high', String) as String
96+
if (watermarkHigh) {
97+
settings["cluster.routing.allocation.disk.watermark.high"] = watermarkHigh
98+
}
99+
return settings
100+
}
101+
82102
def indexTask(Task task) {
83103

84104
//def ct = new CodeTimer("Indexing task ${task.id}")

0 commit comments

Comments
 (0)