Author: acheype Date: 2017-08-21 07:57:25 +0200 (Mon, 21 Aug 2017) New Revision: 281 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/281 Log: Add month&day in each log (dev and prod) Added: trunk/cantharella.web/src/main/resources/old_log4j.xml Removed: trunk/cantharella.web/src/main/resources/log4j_prod.xml Modified: trunk/README.md trunk/cantharella.web/src/main/resources/log4j.xml trunk/src/site/rst/configuration.rst Modified: trunk/README.md =================================================================== --- trunk/README.md 2017-08-10 08:05:10 UTC (rev 280) +++ trunk/README.md 2017-08-21 05:57:25 UTC (rev 281) @@ -153,9 +153,9 @@ [Service] User=root -ExecStartPre=-/usr/local/bin/docker-compose -f /data/cantharella.git/docker/docker-compose-prod.yml down -ExecStart=/usr/local/bin/docker-compose -f /data/cantharella.git/docker/docker-compose-prod.yml up -ExecStop=/usr/local/bin/docker-compose -f /data/cantharella.git/docker/docker-compose-prod.yml stop +ExecStartPre=-/usr/local/bin/docker-compose -f /data/cantharella.git/docker/prod/docker-compose.yml down +ExecStart=/usr/local/bin/docker-compose -f /data/cantharella.git/docker/prod/docker-compose.yml up +ExecStop=/usr/local/bin/docker-compose -f /data/cantharella.git/docker/prod/docker-compose.yml stop [Install] WantedBy=multi-user.target Modified: trunk/cantharella.web/src/main/resources/log4j.xml =================================================================== --- trunk/cantharella.web/src/main/resources/log4j.xml 2017-08-10 08:05:10 UTC (rev 280) +++ trunk/cantharella.web/src/main/resources/log4j.xml 2017-08-21 05:57:25 UTC (rev 281) @@ -29,7 +29,7 @@ <appender name="consoleIRD" class="org.apache.log4j.ConsoleAppender"> <param name="threshold" value="debug" /> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss} %5p (%F:%M:%L) %m%n" /> + <param name="ConversionPattern" value="%d{MM-dd/HH:mm:ss} %5p (%F:%M:%L) %m%n" /> </layout> </appender> @@ -37,7 +37,7 @@ <appender name="consoleRoot" class="org.apache.log4j.ConsoleAppender"> <param name="threshold" value="debug" /> <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss} %5p (%c) %m%n" /> + <param name="ConversionPattern" value="%d{MM-dd/HH:mm:ss} %5p (%c) %m%n" /> </layout> </appender> Deleted: trunk/cantharella.web/src/main/resources/log4j_prod.xml =================================================================== --- trunk/cantharella.web/src/main/resources/log4j_prod.xml 2017-08-10 08:05:10 UTC (rev 280) +++ trunk/cantharella.web/src/main/resources/log4j_prod.xml 2017-08-21 05:57:25 UTC (rev 281) @@ -1,93 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - Cantharella :: Data - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --> - <!DOCTYPE log4j:configuration SYSTEM - "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd"> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Asynchronous daily rolling file logs --> - <!-- <appender name="file" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="file" value="/opt/tomcat/logs/cantharella.log" /> - <param name="threshold" value="info" /> - <param name="datePattern" value="'.'yyyy-MM-dd" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> - </layout> - </appender> - <appender name="async" class="org.apache.log4j.AsyncAppender"> - <param name="bufferSize" value="128" /> - <appender-ref ref="file" /> - </appender> --> - - <!-- E-mail logs --> - <!-- <appender name="mail" class="org.apache.log4j.net.SMTPAppender"> - <param name="SMTPHost" value="smtp.ird.nc" /> - <param name="threshold" value="error" /> - <param name="bufferSize" value="512" /> - <param name="subject" value="[ISlog][Cantharella] Error" /> - <param name="from" value="no-reply@ird.fr" /> - <param name="to" value="ISlog@factor.ird.nc" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> - </layout> - </appender> --> - - <!--Console IRD: detailed logs --> - <appender name="consoleIRD" class="org.apache.log4j.ConsoleAppender"> - <param name="threshold" value="debug" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{MM-dd/HH:mm:ss} %5p (%F:%M:%L) %m%n" /> - </layout> - </appender> - - <!--<!– Console root: simple logs –>--> - <appender name="consoleRoot" class="org.apache.log4j.ConsoleAppender"> - <param name="threshold" value="debug" /> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{MM-dd/HH:mm:ss} %5p (%c) %m%n" /> - </layout> - </appender> - - <!-- Logs IRD --> - <logger name="nc.ird" additivity="false"> - <level value="info" /> - <appender-ref ref="consoleIRD" /> - </logger> - - <!-- Logs Hibernate (you can activate it on dev mode) --> - <logger name="org.hibernate.SQL" additivity="false"> - <level value="OFF" /> - <appender-ref ref="consoleRoot" /> - </logger> - <logger name="org.hibernate.pretty" additivity="false"> - <level value="OFF" /> - <appender-ref ref="consoleRoot" /> - </logger> - - <!-- Logs default --> - <root> - <level value="WARN" /> - <appender-ref ref="consoleRoot" /> - </root> - -</log4j:configuration> \ No newline at end of file Copied: trunk/cantharella.web/src/main/resources/old_log4j.xml (from rev 277, trunk/cantharella.web/src/main/resources/log4j_prod.xml) =================================================================== --- trunk/cantharella.web/src/main/resources/old_log4j.xml (rev 0) +++ trunk/cantharella.web/src/main/resources/old_log4j.xml 2017-08-21 05:57:25 UTC (rev 281) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Cantharella :: Data + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 IRD (Institut de Recherche pour le Developpement) and by respective authors (see below) + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --> + <!DOCTYPE log4j:configuration SYSTEM + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/log4j.dtd"> +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> + + <!-- Asynchronous daily rolling file logs --> + <!-- <appender name="file" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="file" value="/opt/tomcat/logs/cantharella.log" /> + <param name="threshold" value="info" /> + <param name="datePattern" value="'.'yyyy-MM-dd" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> + </layout> + </appender> + <appender name="async" class="org.apache.log4j.AsyncAppender"> + <param name="bufferSize" value="128" /> + <appender-ref ref="file" /> + </appender> --> + + <!-- E-mail logs --> + <!-- <appender name="mail" class="org.apache.log4j.net.SMTPAppender"> + <param name="SMTPHost" value="smtp.ird.nc" /> + <param name="threshold" value="error" /> + <param name="bufferSize" value="512" /> + <param name="subject" value="[ISlog][Cantharella] Error" /> + <param name="from" value="no-reply@ird.fr" /> + <param name="to" value="ISlog@factor.ird.nc" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss.SSS} %5p (%c) %m%n" /> + </layout> + </appender> --> + + <!--Console IRD: detailed logs --> + <appender name="consoleIRD" class="org.apache.log4j.ConsoleAppender"> + <param name="threshold" value="debug" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss} %5p (%F:%M:%L) %m%n" /> + </layout> + </appender> + + <!--<!– Console root: simple logs –>--> + <appender name="consoleRoot" class="org.apache.log4j.ConsoleAppender"> + <param name="threshold" value="debug" /> + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss} %5p (%c) %m%n" /> + </layout> + </appender> + + <!-- Logs IRD --> + <logger name="nc.ird" additivity="false"> + <level value="info" /> + <appender-ref ref="consoleIRD" /> + </logger> + + <!-- Logs Hibernate (you can activate it on dev mode) --> + <logger name="org.hibernate.SQL" additivity="false"> + <level value="OFF" /> + <appender-ref ref="consoleRoot" /> + </logger> + <logger name="org.hibernate.pretty" additivity="false"> + <level value="OFF" /> + <appender-ref ref="consoleRoot" /> + </logger> + + <!-- Logs default --> + <root> + <level value="WARN" /> + <appender-ref ref="consoleRoot" /> + </root> + +</log4j:configuration> \ No newline at end of file Modified: trunk/src/site/rst/configuration.rst =================================================================== --- trunk/src/site/rst/configuration.rst 2017-08-10 08:05:10 UTC (rev 280) +++ trunk/src/site/rst/configuration.rst 2017-08-21 05:57:25 UTC (rev 281) @@ -113,7 +113,7 @@ app.debug=false app.optimize=true wicket.configuration=deployment - log4j.config=classpath:log4j_prod.xml + log4j.config=classpath:log4j.xml #document file max upload size (Mb) document.maxUploadSize=1 \ No newline at end of file