This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch debian9-systemvmtemplate in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 4ae34cbf5902b968c59633fa8e301a8962f9d27c Author: Rohit Yadav <[email protected]> AuthorDate: Thu Nov 23 17:11:34 2017 +0530 use log4j xml don't patch via cloud-early-config Signed-off-by: Rohit Yadav <[email protected]> --- systemvm/conf/log4j-cloud.xml | 95 ++++++++++++++++++++++++---------------- systemvm/systemvm-descriptor.xml | 6 +-- 2 files changed, 61 insertions(+), 40 deletions(-) diff --git a/systemvm/conf/log4j-cloud.xml b/systemvm/conf/log4j-cloud.xml index 9c26bf4..6ad0828 100644 --- a/systemvm/conf/log4j-cloud.xml +++ b/systemvm/conf/log4j-cloud.xml @@ -17,6 +17,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> +<xml version="1.0" encoding="UTF-8"?> <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"; debug="false"> @@ -25,30 +26,61 @@ under the License. <!-- Preserve messages in a local file --> <!-- ================================= --> - <!-- A time/date based rolling appender --> - <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${log.home}systemvm.log"/> + <appender name="FILE1" class="org.apache.log4j.RollingFileAppender"> + <param name="File" value="/var/log/cloud.log"/> + <param name="MaxFileSize" value="10000KB"/> + <param name="MaxBackupIndex" value="4"/> + + <layout class="org.apache.log4j.EnhancedPatternLayout"> + <param name="ConversionPattern" value="%d{ISO8601}{GMT} %-5p [%c{3}] (%t:%x) %m%n"/> + </layout> + </appender> + + <appender name="FILE2" class="org.apache.log4j.RollingFileAppender"> + <param name="File" value="/var/log/cloud/cloud.out"/> + <param name="Append" value="true"/> + <param name="MaxFileSize" value="10000KB"/> + <param name="MaxBackupIndex" value="4"/> + + <layout class="org.apache.log4j.EnhancedPatternLayout"> + <param name="ConversionPattern" value="%d{ISO8601}{GMT} %-5p [%c{3}] (%t:%x) %m%n"/> + </layout> + </appender> + + <appender name="FILE3" class="org.apache.log4j.rolling.RollingFileAppender"> + <param name="File" value="/usr/local/cloud/systemvm/cloud.log"/> + <param name="Append" value="true"/> + <param name="MaxFileSize" value="10000KB"/> + <param name="MaxBackupIndex" value="4"/> + + <layout class="org.apache.log4j.EnhancedPatternLayout"> + <param name="ConversionPattern" value="%d{ISO8601}{GMT} %-5p [%c{3}] (%t:%x) %m%n"/> + </layout> + </appender> + + <appender name="APISERVER" class="org.apache.log4j.rolling.RollingFileAppender"> <param name="Append" value="true"/> <param name="Threshold" value="DEBUG"/> + <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy"> + <param name="FileNamePattern" value="/var/log/cloud/api-server.log.%d{yyyy-MM-dd}{GMT}.gz"/> + <param name="ActiveFileName" value="/var/log/cloud/api-server.log"/> + </rollingPolicy> - <!-- Rollover at midnight each day --> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c{3}] (%t:%x) %m%n"/> + <layout class="org.apache.log4j.EnhancedPatternLayout"> + <param name="ConversionPattern" value="%d{ISO8601}{GMT} %m%n"/> </layout> </appender> - + <!-- ============================== --> <!-- Append messages to the console --> <!-- ============================== --> <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> <param name="Target" value="System.out"/> - <param name="Threshold" value="WARN"/> + <param name="Threshold" value="INFO"/> - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/> + <layout class="org.apache.log4j.EnhancedPatternLayout"> + <param name="ConversionPattern" value="%d{ABSOLUTE}{GMT} %5p %c{1}:%L - %m%n"/> </layout> </appender> @@ -56,26 +88,14 @@ under the License. <!-- Limit categories --> <!-- ================ --> - <category name="com.cloud.console.ConsoleCanvas"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyAjaxImageHandler"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy.ConsoleProxyViewer"> - <priority value="WARN"/> - </category> - - <category name="com.cloud.consoleproxy"> - <priority value="INFO"/> + <category name="com.cloud"> + <priority value="DEBUG"/> </category> - <category name="com.cloud"> + <category name="org.apache.cloudstack"> <priority value="DEBUG"/> </category> - + <!-- Limit the org.apache category to INFO as its DEBUG is verbose --> <category name="org.apache"> <priority value="INFO"/> @@ -84,20 +104,19 @@ under the License. <category name="org"> <priority value="INFO"/> </category> - + <category name="net"> <priority value="INFO"/> </category> - <!-- Limit the com.amazonaws category to INFO as its DEBUG is verbose --> - <category name="com.amazonaws"> - <priority value="INFO"/> + <category name="apiserver.com.cloud"> + <priority value="DEBUG"/> </category> - <!-- Limit the httpclient.wire category to INFO as its DEBUG is verbose --> - <category name="httpclient.wire"> - <priority value="INFO"/> - </category> + <logger name="apiserver.com.cloud" additivity="false"> + <level value="DEBUG"/> + <appender-ref ref="APISERVER"/> + </logger> <!-- ======================= --> <!-- Setup the Root category --> @@ -106,7 +125,9 @@ under the License. <root> <level value="INFO"/> <appender-ref ref="CONSOLE"/> - <appender-ref ref="FILE"/> + <appender-ref ref="FILE1"/> + <appender-ref ref="FILE2"/> + <appender-ref ref="FILE3"/> </root> </log4j:configuration> diff --git a/systemvm/systemvm-descriptor.xml b/systemvm/systemvm-descriptor.xml index eec916e..ce5ae4b 100644 --- a/systemvm/systemvm-descriptor.xml +++ b/systemvm/systemvm-descriptor.xml @@ -58,8 +58,8 @@ <fileMode>555</fileMode> <includes> <include>log4j-cloud.xml</include> - <include>consoleproxy.properties</include> - <include>agent.properties</include> + <include>consoleproxy.properties</include> + <include>agent.properties</include> </includes> </fileSet> <fileSet> @@ -69,7 +69,7 @@ <fileMode>555</fileMode> <includes> <include>*.jpg</include> - <include>*.gif</include> + <include>*.gif</include> <include>*.png</include> <include>*.cur</include> </includes> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
