Mercurial > lada > lada-server
changeset 887:305f138982eb
Move auto-setting 'fertig' to correct block.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Mon, 15 Feb 2016 12:31:31 +0100 |
| parents | 72df22ada23a |
| children | 27febad6fb84 |
| files | src/main/java/de/intevation/lada/rest/StatusService.java src/main/java/de/intevation/lada/validation/rules/messung/MessgroesseToMessmethode.java src/main/webapp/WEB-INF/classes/log4j.properties |
| diffstat | 3 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/rest/StatusService.java Mon Feb 15 12:19:36 2016 +0100 +++ b/src/main/java/de/intevation/lada/rest/StatusService.java Mon Feb 15 12:31:31 2016 +0100 @@ -312,14 +312,14 @@ else { return new Response(false, 699, null); } + } - // auto-set 'fertig'-flag - if (status.getStatusStufe() == 1) { - messung.setFertig(true); - } - else if (status.getStatusWert() == 4) { - messung.setFertig(false); - } + // auto-set 'fertig'-flag + if (status.getStatusStufe() == 1) { + messung.setFertig(true); + } + else if (status.getStatusWert() == 4) { + messung.setFertig(false); } } Violation violation = validator.validate(status);
--- a/src/main/java/de/intevation/lada/validation/rules/messung/MessgroesseToMessmethode.java Mon Feb 15 12:19:36 2016 +0100 +++ b/src/main/java/de/intevation/lada/validation/rules/messung/MessgroesseToMessmethode.java Mon Feb 15 12:31:31 2016 +0100 @@ -74,7 +74,9 @@ for(LMesswert messwert: messwerte) { boolean hit = false; for (MmtMessgroesse messgroesse: found) { - logger.debug("###### mmt: " + messwert.getMessgroesseId() + " mmtmg: " + messgroesse.getMmtMessgroessePK().getMessgroessengruppeId()); + logger.trace("###### mmt: " + messwert.getMessgroesseId() + + " mmtmg: " + messgroesse.getMmtMessgroessePK() + .getMessgroessengruppeId()); if (messwert.getMessgroesseId().equals( messgroesse.getMmtMessgroessePK().getMessgroessengruppeId())) { hit = true;
--- a/src/main/webapp/WEB-INF/classes/log4j.properties Mon Feb 15 12:19:36 2016 +0100 +++ b/src/main/webapp/WEB-INF/classes/log4j.properties Mon Feb 15 12:31:31 2016 +0100 @@ -3,8 +3,8 @@ log4j.logger.org.openid4java=WARN log4j.logger.org.hibernate=ERROR log4j.appender.lada=org.apache.log4j.RollingFileAppender -log4j.appender.lada.File=/var/log/wildfly/lada-server.log -log4j.appender.lada.MaxFileSize=1MB +log4j.appender.lada.File=/usr/src/lada-server/log/lada-server.log +log4j.appender.lada.MaxFileSize=20MB log4j.appender.lada.MaxBackupIndex=5 log4j.appender.lada.layout=org.apache.log4j.PatternLayout -log4j.appender.lada.layout.ConversionPattern=%d %p %l: %m%n +log4j.appender.lada.layout.ConversionPattern=%d{HH:mm:ss,sss}: %-5p %c{1} - %m%n