From 06b54e67c51a758e5adb78f852257a5e1069f6a5 Mon Sep 17 00:00:00 2001
From: Richard Peter <richard.peter@raytheon.com>
Date: Mon, 15 Apr 2013 12:52:40 -0500
Subject: [PATCH] Issue #1814: Change baseline memory configuration and
 baseline default log configuration

Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3

Former-commit-id: 81749b9af562bc68b76528624c5c2b0f385e3536 [formerly c10d2f75206cbe2d8c4971680c85df9de5acbe30] [formerly 0c869ee231cef1307d4b8267db65f14548e5021d] [formerly 81749b9af562bc68b76528624c5c2b0f385e3536 [formerly c10d2f75206cbe2d8c4971680c85df9de5acbe30] [formerly 0c869ee231cef1307d4b8267db65f14548e5021d] [formerly 78b230aaafc6ad503627bb56f9d4e0c1df21fa93 [formerly 0c869ee231cef1307d4b8267db65f14548e5021d [formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]]
Former-commit-id: 78b230aaafc6ad503627bb56f9d4e0c1df21fa93
Former-commit-id: 227dcdbd814ee0827117f649dcf804e4f01041c4 [formerly a281d26608cf602e623aee78ed566ab2ec2abd5c] [formerly 9271b9a667b720d809e7d8db48bb876251b35cf8 [formerly d967301cfc12df8206ec09994559784c0b93167c]]
Former-commit-id: b526a87e57e2ff9413674036431ad8b679510a09 [formerly 4e9789f56d067fd1866886c443889dd860269f84]
Former-commit-id: ec77d423fe1cefe54ecada95cc7881dad6e5c1bc
---
 rpms/awips2.qpid/0.18/SOURCES/log4j.xml | 130 ++++++++++++++++++++++++
 rpms/awips2.qpid/0.18/SOURCES/qpidd     |   2 +-
 2 files changed, 131 insertions(+), 1 deletion(-)
 create mode 100644 rpms/awips2.qpid/0.18/SOURCES/log4j.xml

diff --git a/rpms/awips2.qpid/0.18/SOURCES/log4j.xml b/rpms/awips2.qpid/0.18/SOURCES/log4j.xml
new file mode 100644
index 0000000000..4ada971857
--- /dev/null
+++ b/rpms/awips2.qpid/0.18/SOURCES/log4j.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements.  See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership.  The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License.  You may obtain a copy of the License at
+ -
+ -   http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied.  See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+ --><!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="null" threshold="null">
+    <appender class="org.apache.log4j.QpidCompositeRollingAppender" name="ArchivingFileAppender">
+        <!-- Ensure that logs always have the DatePattern appended to the filename.
+             DEFAULT IF NOT CONFIGURED: true -->
+        <param name="StaticLogFileName" value="true"/>
+        <param name="file" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
+        <!-- Style of rolling to use, by:
+             File Size(1)
+             Date(2)
+             Both(3)
+
+             When Date (or Both) is enabled then the value of DatePattern will determine
+             when the new file is made. e.g. a DatePattern of "'.'yyyy-MM-dd-HH-mm"
+             which includes minutes will cause a new backup file to be made every minute.
+
+             DEFAULT IF NOT CONFIGURED: 3 -->
+        <param name="RollingStyle" value="2"/>
+        <!-- Set the count direction:
+             Negative numbers mean backups are numbered <latest>, .0, .1, .2,..., .n
+             0 means backup is DatePattern stamped and followed with a Positive number
+                 if the DatePattern stamp clashes with other existing backups.
+             Positive numbers mean backups are numbered 0, 1, 2, ..., n, <latest>
+
+             DEFAULT IF NOT CONFIGURED: -1 -->
+        <param name="CountDirection" value="0"/>
+        <!-- Maximum File Size:
+             DEFAULT IF NOT CONFIGURED: 10MB -->
+        <param name="MaxFileSize" value="500MB"/>
+        <!-- Date Pattern:
+             DEFAULT IF NOT CONFIGURED: "'.'yyyy-MM-dd" -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+        <!-- Maximum number of backup files:
+              0 means no backups
+             -1 means infinite backups
+
+             DEFAULT IF NOT CONFIGURED: 0 -->
+        <param name="MaxSizeRollBackups" value="14"/>
+        <!-- Compress(gzip) the backup files to the backup location:
+             DEFAULT IF NOT CONFIGURED: FALSE -->
+        <param name="CompressBackupFiles" value="true"/>
+        <!-- Compress the backup files using a second thread:
+             DEFAULT IF NOT CONFIGURED: FALSE -->
+        <param name="CompressAsync" value="true"/>
+        <!-- Backup Location:
+             DEFAULT IF NOT CONFIGURED: same dir as log file -->
+        <param name="backupFilesToPath" value="${QPID_WORK}/log"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender class="org.apache.log4j.FileAppender" name="FileAppender">
+        <param name="File" value="${QPID_WORK}/log/${logprefix}qpid${logsuffix}.log"/>
+        <param name="Append" value="false"/>
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <appender class="org.apache.log4j.ConsoleAppender" name="STDOUT">
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d %-5p [%t] (%F:%L) - %m%n"/>
+        </layout>
+    </appender>
+
+    <!-- Provide warnings to standard output -->
+    <category additivity="true" name="org.apache.qpid">
+        <priority value="info"/>
+    </category>
+
+    <!-- Enable info messages for the status-logging hierarchy -->
+    <logger additivity="true" name="qpid.message">
+      <level value="warn"/>
+    </logger>
+
+    <!-- Subscription state may toggle frequently for clients with low prefetch
+    so switch off this operational logging by default-->
+    <logger additivity="true" name="qpid.message.subscription.state">
+      <level value="off"/>
+    </logger>
+
+    <!-- Enable log messages for the queue notifications -->
+    <logger additivity="true" name="org.apache.qpid.server.queue.NotificationCheck">
+      <level value="info"/>
+    </logger>
+
+    <!-- Examples of additional logging settings -->
+    <!-- Used to generate extra debug. See debug.log4j.xml -->
+    
+    <category additivity="true" name="org.apache.qpid.server.store">
+        <priority value="warn"/>
+    </category>
+
+    <!-- Set the commons logging that the XML parser uses to WARN, it is very chatty at debug -->
+    <logger name="org.apache.commons">
+        <level value="WARN"/>
+    </logger>
+
+    <!-- Log all info events to file -->
+    <root>
+        <priority value="info"/>
+        <!--appender-ref ref="FileAppender"/-->
+        <appender-ref ref="ArchivingFileAppender"/>
+    </root>
+
+</log4j:configuration>
diff --git a/rpms/awips2.qpid/0.18/SOURCES/qpidd b/rpms/awips2.qpid/0.18/SOURCES/qpidd
index 514b96aa81..46b5d44659 100644
--- a/rpms/awips2.qpid/0.18/SOURCES/qpidd
+++ b/rpms/awips2.qpid/0.18/SOURCES/qpidd
@@ -29,7 +29,7 @@ TODAY=`/bin/date +%Y%m%d`
 
 QPID_HOME=/awips2/qpid
 
-QPID_JAVA_MEM=-Xmx3072m
+export QPID_JAVA_MEM=-Xmx2048m
 
 start() {
    isRunning=`ps -ef | grep org.apache.qpid.server.Main | grep -c "PNAME=QPBRKR "`