Issue #951 added Appender EnvConfigurableRollingFileAppender.

Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b

Former-commit-id: 4b383c3274 [formerly 4d103fe06c94b8d5067e44aaabfdac88347f9a96]
Former-commit-id: d10cabc917

cave/build/static/linux/alertviz/alertviz.sh

@@ -88,7 +88,8 @@ fi
 while [ $exitVal -ne 0 ]
 do
  curTime=`date +%Y%m%d_%H%M%S`
- LOGFILE=${LOGDIR}/alertviz_${curTime}.log
+ LOGFILE=${LOGDIR}/alertviz_${curTime}_console.log
+ export LOGFILE_ALERTVIZ=${LOGDIR}/alertviz_${curTime}_admin.log
 
  #first check if we can write to the directory
  if [ -w ${LOGDIR} ]; then

cave/build/static/linux/cave/cave.sh

@@ -116,7 +116,8 @@ fi
 export pid=$$
 
 curTime=`date +%Y%m%d_%H%M%S`
-LOGFILE=${LOGDIR}/cave_${curTime}_pid_${pid}.log
+LOGFILE=${LOGDIR}/cave_${curTime}_pid_${pid}_console.log
+export LOGFILE_CAVE=${LOGDIR}/cave_${curTime}_pid_${pid}_alertviz.log
 
 redirect="TRUE"
 for flag in $@; do

cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertVisualization.java

@@ -632,7 +632,7 @@ public class AlertVisualization implements ITimerAction, IAudioAction,
                 || statMsg.getSourceKey().equals("GDN_ADMIN");
 
         if (isGdnAdminMessage) {
-            Container.logInternal(statMsg);
+            // Container.logInternal(statMsg);
             if ((statMsg.getDetails() != null)
                     && (statMsg.getDetails().contains("Error")
                             || statMsg.getDetails().contains("Exception")

cave/com.raytheon.uf.viz.alertviz/META-INF/MANIFEST.MF

@@ -29,3 +29,5 @@ Import-Package: com.raytheon.uf.common.python,
  com.raytheon.uf.viz.python.swt,
  com.raytheon.uf.viz.python.swt.widgets
 Bundle-ActivationPolicy: lazy
+Eclipse-BuddyPolicy: ext, registered, global
+Eclipse-RegisterBuddy: org.apache.log4j

cave/com.raytheon.uf.viz.alertviz/build.properties

@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                lib/derbyrun.jar,\
                lib/derby.jar,\
                statusMessage.xsd,\
-               config.xml
+               config.xml,\
+               log4j-alertviz.xml

cave/com.raytheon.uf.viz.alertviz/log4j-alertviz.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> 
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+   <!-- general application log --> 
+   <appender name="console" class="org.apache.log4j.ConsoleAppender"> 
+      <layout class="org.apache.log4j.PatternLayout"> 
+         <param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/> 
+      </layout> 
+      <filter class="org.apache.log4j.varia.LevelRangeFilter">
+         <param name="levelMin" value="DEBUG" />
+         <param name="levelMax" value="INFO" />
+      </filter>
+   </appender>
+
+   <appender name="errConsole" class="org.apache.log4j.ConsoleAppender">
+      <param name="Target" value="System.err"/> 
+      <param name="Threshold" value="WARN" /> 
+      <layout class="org.apache.log4j.PatternLayout"> 
+         <param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/> 
+      </layout> 
+   </appender>
+   
+   <appender name="AlertVizAdminLogAppender" class="com.raytheon.uf.viz.alertviz.EnvConfigurableRollingFileAppender">
+      <param name="envLogVar" value="LOGFILE_ALERTVIZ"  />
+      <param name="maxFileSize" value="2GB"/>
+      <param name="maxBackupIndex" value="5"/>
+      <param name="Append" value="true"/>
+      <layout class="org.apache.log4j.EnhancedPatternLayout"> 
+         <param name="ConversionPattern" value="%-5p %d [%t] : %m%n"/> 
+      </layout>
+   </appender> 
+   
+   <logger name="AlertVizAdminLogger" additivity="false">
+      <level value="ALL"/>
+      <appender-ref ref="AlertVizAdminLogAppender"/>
+   </logger>
+
+   <logger name="com.raytheon">
+      <level value="INFO"/>
+   </logger>
+
+   <logger name="com.tc">
+      <level value="WARN"/>
+   </logger>
+   <logger name="mx4j">
+      <level value="ERROR"/>
+   </logger>
+   <logger name="org.apache">
+      <level value="INFO"/>
+   </logger>
+   <logger name="org.apache.activemq.spring">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.commons.beanutils">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.qpid">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.geotools">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.xbean.spring">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.springframework">
+      <level value="ERROR"/>
+   </logger>
+   <logger name="uk.ltd.getahead">
+      <level value="WARN"/>
+   </logger>
+
+   <!-- default logging --> 
+   <root> 
+      <level value="INFO"/> 
+      <appender-ref ref="console"/> 
+      <appender-ref ref="errConsole"/>
+    </root> 
+</log4j:configuration> 

cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java

@@ -230,7 +230,7 @@ public class AlertvizJob extends Job {
                                                 e);
                                 StatusMessage sm = new StatusMessage();
                                 sm.setPriority(Priority.CRITICAL);
-                                sm.setMachine("LOCAL");
+                                sm.setMachineToCurrent();
                                 sm.setCategory("GDN_ADMIN");
                                 sm.setSourceKey("GDN_ADMIN");
                                 sm.setMessage(e.getMessage());

cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/Container.java

@@ -36,7 +36,7 @@ import com.raytheon.uf.viz.alertviz.config.Category;
 import com.raytheon.uf.viz.alertviz.config.Configuration;
 import com.raytheon.uf.viz.alertviz.config.ForcedConfiguration;
 import com.raytheon.uf.viz.alertviz.config.Source;
-import com.raytheon.uf.viz.alertviz.internal.ArchiveLogJob;
+import com.raytheon.uf.viz.alertviz.internal.PurgeLogJob;
 import com.raytheon.uf.viz.alertviz.internal.LogMessageDAO;
 import com.raytheon.uf.viz.core.VizApp;
 
@@ -63,8 +63,8 @@ public class Container implements IConfigurationChangedListener {
 
     public static final String SOURCE_MISSING = "Source was not found";
 
-    private transient static final org.apache.log4j.Logger internalLogger = Logger
+    private transient static final org.apache.log4j.Logger adminLogger = Logger
-            .getLogger("AlertVizLogger");
+            .getLogger("AlertVizAdminLogger");
 
     private Configuration configuration;
 
@@ -96,7 +96,7 @@ public class Container implements IConfigurationChangedListener {
                 .getForcedConfiguration();
         ConfigurationManager.getInstance().addListener(this);
         this.callbacks = callbacks;
-        ArchiveLogJob archive = new ArchiveLogJob();
+        PurgeLogJob archive = new PurgeLogJob();
         archive.schedule();
     }
 
@@ -171,7 +171,7 @@ public class Container implements IConfigurationChangedListener {
         // for now, just send to the regular log
         StatusMessage sm = new StatusMessage();
         sm.setPriority(priority);
-        sm.setMachine("LOCAL");
+        sm.setMachineToCurrent();
         sm.setSourceKey("GDN_ADMIN");
         sm.setCategory("GDN)ADMIN");
         sm.setMessage(msg);
@@ -319,24 +319,25 @@ public class Container implements IConfigurationChangedListener {
         String cat = message.getCategory();
         String source = message.getSourceKey();
 
-        if ((cat != null && cat.equalsIgnoreCase("GDN_ADMIN"))
+        boolean isInternal = (cat != null && cat.equalsIgnoreCase("GDN_ADMIN"))
-                || (source != null && source.equalsIgnoreCase("GDN_ADMIN"))) {
+                || (source != null && source.equalsIgnoreCase("GDN_ADMIN"));
+        if (isInternal) {
             switch (message.getPriority()) {
             case CRITICAL:
-                internalLogger.fatal(message);
+                adminLogger.fatal(message);
                 break;
             case SIGNIFICANT:
-                internalLogger.error(message);
+                adminLogger.error(message);
                 break;
             case PROBLEM:
-                internalLogger.warn(message);
+                adminLogger.warn(message);
                 break;
             case EVENTA: // fall through
             case EVENTB:
-                internalLogger.info(message);
+                adminLogger.info(message);
                 break;
             case VERBOSE:
-                internalLogger.debug(message);
+                adminLogger.debug(message);
                 break;
             }
         }

cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/EnvConfigurableRollingFileAppender.java

@@ -0,0 +1,80 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ * 
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ * 
+ * Contractor Name:        Raytheon Company
+ * Contractor Address:     6825 Pine Street, Suite 340
+ *                         Mail Stop B8
+ *                         Omaha, NE 68106
+ *                         402.291.0100
+ * 
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.viz.alertviz;
+
+import org.apache.log4j.RollingFileAppender;
+import org.apache.log4j.helpers.LogLog;
+
+/**
+ * RollingFileAppender retrieves the value set for property EnvLogVar from the
+ * system environment to define the log file.
+ * 
+ * <pre>
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date         Ticket#    Engineer    Description
+ * ------------ ---------- ----------- --------------------------
+ * Sep 10, 2012            bgonzale     Initial creation
+ * 
+ * </pre>
+ * 
+ * @author bgonzale
+ * @version 1.0
+ */
+
+public class EnvConfigurableRollingFileAppender extends RollingFileAppender {
+
+    private String envLogVar;
+
+    /**
+     * @param envLogVar
+     *            the envLogVar to set
+     */
+    public void setEnvLogVar(String envLogVar) {
+        this.envLogVar = envLogVar;
+        setFileFromEnv();
+    }
+
+    /**
+     * @return the envLogVar
+     */
+    public String getEnvLogVar() {
+        return envLogVar;
+    }
+
+    private void setFileFromEnv() {
+        if (envLogVar == null || envLogVar.isEmpty()) {
+            LogLog.error("Appender [" + name
+                    + "] requires EnvLogVar to be set.");
+        } else {
+            String file = System.getenv(envLogVar);
+
+            if (file == null || file.isEmpty()) {
+                LogLog.error("Appender [" + name
+                        + "] needs environment variable, " + envLogVar
+                        + ", to be set.");
+            } else {
+                setFile(file);
+            }
+        }
+    }
+
+}

cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/SystemStatusHandler.java

@@ -19,6 +19,7 @@
  **/
 package com.raytheon.uf.viz.alertviz;
 
+import org.apache.log4j.Logger;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.ErrorDialog;
@@ -50,6 +51,9 @@ import com.raytheon.uf.viz.core.status.VizStatusInternal;
 
 public class SystemStatusHandler extends AbstractStatusHandler {
 
+    private transient static final org.apache.log4j.Logger logger = Logger
+            .getLogger("CaveLogger");
+
     private static final String WORKSTATION = "WORKSTATION";
 
     /*
@@ -66,14 +70,13 @@ public class SystemStatusHandler extends AbstractStatusHandler {
 
         if (status instanceof VizStatusInternal) {
             VizStatusInternal vs = (VizStatusInternal) status;
-            sm = new StatusMessage(vs.getSource(), vs.getCategory(),
+            sm = vs.toStatusMessage();
-                    vs.getPriority(), vs.getPluginName(), vs.getMessage(),
-                    vs.getException());
         } else {
             sm = from(status);
         }
 
         try {
+            logStatus(sm);
             AlertVizClient.sendMessage(sm);
         } catch (final AlertvizException e) {
             // not a good situation, since we can't communicate with the log
@@ -111,7 +114,7 @@ public class SystemStatusHandler extends AbstractStatusHandler {
         StatusMessage sm = new StatusMessage();
         sm.setCategory(WORKSTATION);
 
-        sm.setMachine("LOCAL");
+        sm.setMachineToCurrent();
         switch (status.getSeverity()) {
         case Status.ERROR:
             sm.setPriority(Priority.SIGNIFICANT);
@@ -184,4 +187,26 @@ public class SystemStatusHandler extends AbstractStatusHandler {
             int count) throws AlertvizException {
         return LogMessageDAO.getInstance().load(count, category);
     }
+
+    private void logStatus(StatusMessage status) {
+        switch (status.getPriority()) {
+        case CRITICAL:
+            logger.fatal(status);
+            break;
+        case SIGNIFICANT:
+            logger.error(status);
+            break;
+        case PROBLEM:
+            logger.warn(status);
+            break;
+        case EVENTA: // fall through
+        case EVENTB:
+            logger.info(status);
+            break;
+        case VERBOSE:
+            logger.debug(status);
+            break;
+        }
+    }
+
 }

cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/internal/LogMessageDAO.java

@@ -250,7 +250,7 @@ public class LogMessageDAO {
     }
 
     public void save(StatusMessage sm) throws AlertvizException {
-        // Container.logInternal(sm);
+        Container.logInternal(sm);
         synchronized (this) {
             boolean errorOccurred = false;
             ResultSet rs = null;

cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/internal/PurgeLogJob.java

@@ -19,7 +19,6 @@
  **/
 package com.raytheon.uf.viz.alertviz.internal;
 
-import java.io.File;
 import java.sql.Timestamp;
 
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -32,13 +31,9 @@ import org.eclipse.swt.widgets.Display;
 import com.raytheon.uf.viz.alertviz.Activator;
 import com.raytheon.uf.viz.alertviz.AlertvizException;
 import com.raytheon.uf.viz.alertviz.Constants;
-import com.raytheon.uf.viz.alertviz.LogUtil;
-import com.raytheon.uf.viz.alertviz.LogUtil.Order;
-import com.raytheon.uf.viz.core.VizApp;
-import com.raytheon.uf.viz.core.localization.LocalizationManager;
 
 /**
- * Purges the database, and archives the old log entries to a text file
+ * Purges old database entries.
  * 
  * <pre>
  * SOFTWARE HISTORY
@@ -50,26 +45,16 @@ import com.raytheon.uf.viz.core.localization.LocalizationManager;
  * @author chammack
  * @version 1.0
  */
-public class ArchiveLogJob extends Job {
+public class PurgeLogJob extends Job {
-
-    private int numberOfLogsToKeep;
 
     private int ageOfLogInHours;
 
-    private static final int DEFAULT_NUMBER_OF_LOGS = 10;
-
     private static final int DEFAULT_AGE_OF_LOG_IN_HRS = 12;
 
     private static final int MILLISECONDS_IN_HOUR = 60 * 60 * 1000;
 
-    public ArchiveLogJob() {
+    public PurgeLogJob() {
-        super("Archive Log");
+        super("Archive Log Purge");
-        this.setSystem(true);
-        numberOfLogsToKeep = Activator.getDefault().getPreferenceStore()
-                .getInt(Constants.P_NUMBER_OF_LOGS);
-        if (numberOfLogsToKeep == 0) {
-            this.numberOfLogsToKeep = DEFAULT_NUMBER_OF_LOGS;
-        }
 
         ageOfLogInHours = Activator.getDefault().getPreferenceStore()
                 .getInt(Constants.P_MAX_AGE_OF_LOGS);
@@ -90,14 +75,8 @@ public class ArchiveLogJob extends Job {
             long now = System.currentTimeMillis();
 
             if ((now - lastPurgeInMs) > (ageOfLogInHours * MILLISECONDS_IN_HOUR)) {
-                String s = LocalizationManager.getUserDir() + "textLogs"
-                        + File.separator + VizApp.getHostName()
-                        + File.separator + "log";
-                LogUtil.rollLogs(s, numberOfLogsToKeep);
-
                 Timestamp ts = new Timestamp(now
                         - (ageOfLogInHours * MILLISECONDS_IN_HOUR));
-                LogUtil.saveLogToFile(new File(s + ".0"), ts, Order.BEFORE);
                 LogMessageDAO.getInstance().purge(ts);
             }
         } catch (AlertvizException e) {
@@ -111,7 +90,7 @@ public class ArchiveLogJob extends Job {
                             .openError(
                                     Display.getDefault().getActiveShell(),
                                     "Error",
-                                    "Error rotating saving and rotating logs.  Archived logs may not be stored",
+                            "Error purging logs.",
                                     s);
                 }
 

cave/com.raytheon.uf.viz.core/META-INF/MANIFEST.MF

@@ -34,7 +34,7 @@ Require-Bundle: org.eclipse.ui,
  com.raytheon.uf.common.geospatial;bundle-version="1.12.1174"
 Bundle-ActivationPolicy: lazy
 Eclipse-BuddyPolicy: ext, registered, global
-Eclipse-RegisterBuddy: org.apache.velocity, com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.common.serialization.comm, com.raytheon.uf.common.status, com.raytheon.uf.common.dataplugin.level
+Eclipse-RegisterBuddy: org.apache.velocity, org.apache.log4j, com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.uf.common.serialization.comm, com.raytheon.uf.common.status, com.raytheon.uf.common.dataplugin.level
 Export-Package: com.raytheon.uf.viz.core,
  com.raytheon.uf.viz.core.alerts,
  com.raytheon.uf.viz.core.auth,

cave/com.raytheon.uf.viz.core/build.properties

@@ -5,4 +5,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                config.xml,\
                scriptTemplates/,\
-               schema/
+               schema/,\
+               log4j-viz-core.xml

cave/com.raytheon.uf.viz.core/log4j-viz-core.xml

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> 
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+   <appender name="console" class="org.apache.log4j.ConsoleAppender"> 
+      <layout class="org.apache.log4j.PatternLayout"> 
+         <param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/> 
+      </layout> 
+      <filter class="org.apache.log4j.varia.LevelRangeFilter">
+         <param name="levelMin" value="DEBUG" />
+         <param name="levelMax" value="INFO" />
+      </filter>
+   </appender>
+
+   <appender name="errConsole" class="org.apache.log4j.ConsoleAppender">
+      <param name="Target" value="System.err"/> 
+      <param name="Threshold" value="WARN" /> 
+      <layout class="org.apache.log4j.PatternLayout"> 
+         <param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/> 
+      </layout> 
+   </appender>
+   
+   <appender name="CaveLogAppender" class="com.raytheon.uf.viz.alertviz.EnvConfigurableRollingFileAppender">
+      <param name="envLogVar" value="LOGFILE_CAVE"  />
+      <param name="maxFileSize" value="2GB"/>
+      <param name="maxBackupIndex" value="5"/>
+      <param name="Append" value="true"/>
+      <layout class="org.apache.log4j.EnhancedPatternLayout"> 
+         <param name="ConversionPattern" value="%-5p %d [%t] %m%n"/> 
+      </layout>
+   </appender>    
+   
+   <appender name="AsyncCaveLogAppender" class="org.apache.log4j.AsyncAppender">
+      <param name="BufferSize" value="500"/>
+      <appender-ref ref="CaveLogAppender"/>
+   </appender> 
+   <logger name="CaveLogger" additivity="false">
+      <level value="ALL"/>
+      <appender-ref ref="AsyncCaveLogAppender"/>
+   </logger>
+
+   <logger name="com.raytheon">
+      <level value="INFO"/>
+   </logger>
+
+   <logger name="com.tc">
+      <level value="WARN"/>
+   </logger>
+   <logger name="mx4j">
+      <level value="ERROR"/>
+   </logger>
+   <logger name="org.apache">
+      <level value="INFO"/>
+   </logger>
+   <logger name="org.apache.activemq.spring">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.commons.beanutils">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.qpid">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.geotools">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.apache.xbean.spring">
+      <level value="WARN"/>
+   </logger>
+   <logger name="org.springframework">
+      <level value="ERROR"/>
+   </logger>
+   <logger name="uk.ltd.getahead">
+      <level value="WARN"/>
+   </logger>
+   <root> 
+      <level value="INFO"/> 
+      <appender-ref ref="console"/> 
+      <appender-ref ref="errConsole"/>
+    </root> 
+</log4j:configuration> 

cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/status/VizStatusHandler.java

@@ -88,8 +88,9 @@ public class VizStatusHandler implements IUFStatusHandler {
                 this.source = factory.getSource(source, pluginId);
             }
         }
-        StatusManager.getManager().handle(
+        VizStatusInternal vizStatus = new VizStatusInternal(status, category,
-                new VizStatusInternal(status, category, source, pluginId));
+                source, pluginId);
+        StatusManager.getManager().handle(vizStatus);
     }
 
     @Override

cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/status/VizStatusInternal.java

@@ -22,6 +22,7 @@ package com.raytheon.uf.viz.core.status;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
+import com.raytheon.uf.common.message.StatusMessage;
 import com.raytheon.uf.common.status.UFStatus;
 
 /**
@@ -170,4 +171,9 @@ public class VizStatusInternal extends UFStatus implements IStatus {
         return pluginName;
     }
 
+    public StatusMessage toStatusMessage() {
+        return new StatusMessage(this.source, this.category, this.priority,
+                this.pluginName, this.message, this.exception);
+    }
+
 }

cave/com.raytheon.uf.viz.product.alertviz/alertviz.product

@@ -20,12 +20,11 @@ Developed on the Raytheon Visualization Environment (viz)
    <launcherArgs>
       <programArgs>-data @user.home/caveData -user @user.home/caveData -clean</programArgs>
       <programArgsLin>-consoleLog</programArgsLin>
-      <vmArgs>-Xincgc -Xmx256M -Xss2024k -Dosgi.instance.area.readOnly=true -Dosgi.hook.configurators.exclude=org.eclipse.core.runtime.internal.adaptor.EclipseLogHook,org.eclipse.core.runtime.internal.adaptor.EclipseErrorHandler -Dorg.eclipse.update.reconcile=false -Dqpid.dest_syntax=BURL -Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=128m -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme -Dawips.mode=pypies -Dqpid.dest_syntax=BURL -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false</vmArgs>
+      <vmArgs>-Xincgc -Xmx256M -Xss2024k -Dosgi.instance.area.readOnly=true -Dosgi.hook.configurators.exclude=org.eclipse.core.runtime.internal.adaptor.EclipseLogHook,org.eclipse.core.runtime.internal.adaptor.EclipseErrorHandler -Dorg.eclipse.update.reconcile=false -Dqpid.dest_syntax=BURL -Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=128m -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme -Dawips.mode=pypies -Dqpid.dest_syntax=BURL -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j.configuration=log4j-alertviz.xml</vmArgs>
    </launcherArgs>
 
    <windowImages/>
 
-
    <launcher name="alertviz">
       <solaris/>
       <win useIco="false">
@@ -39,7 +38,6 @@ Developed on the Raytheon Visualization Environment (viz)
       </win>
    </launcher>
 
-
    <vm>
       <linux include="true">jdk1.6.0</linux>
       <windows include="true">jdk1.6.0</windows>

cave/com.raytheon.viz.product.awips/awips.product

@@ -18,7 +18,7 @@
       <programArgsLin>-consoleLog</programArgsLin>
       <vmArgs>-Xincgc -Xmx1280M -Dosgi.instance.area.readOnly=true 
 -Dosgi.hook.configurators.exclude=org.eclipse.core.runtime.internal.adaptor.EclipseLogHook,org.eclipse.core.runtime.internal.adaptor.EclipseErrorHandler 
--XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=128m -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme -Dawips.mode=pypies -Dqpid.dest_syntax=BURL -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -XX:OnOutOfMemoryError=&quot;capture -t no -p $pid &amp;&quot;</vmArgs>
+-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=128m -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme -Dawips.mode=pypies -Dqpid.dest_syntax=BURL -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -XX:OnOutOfMemoryError=&quot;capture -t no -p $pid &amp;&quot; -Dlog4j.configuration=log4j-viz-core.xml</vmArgs>
       <vmArgsWin>-Dfile.encoding=UTF-8</vmArgsWin>
    </launcherArgs>
 

cave/com.raytheon.viz.product.awips/developer.product

@@ -17,7 +17,7 @@
       <programArgs>-data @user.home/caveData -user @user.home/caveData -clean -consoleLog -alertviz</programArgs>
       <vmArgs>-Xincgc -Xmx1024M -Dosgi.instance.area.readOnly=true 
 -Dosgi.hook.configurators.exclude=org.eclipse.core.runtime.internal.adaptor.EclipseLogHook,org.eclipse.core.runtime.internal.adaptor.EclipseErrorHandler 
--XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=128m -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme -Dawips.mode=pypies -Dqpid.dest_syntax=BURL -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false</vmArgs>
+-XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -Dorg.eclipse.update.reconcile=false -XX:MaxPermSize=128m -Dorg.eclipse.ui/KEY_CONFIGURATION_ID=com.raytheon.viz.ui.awips.scheme -Dawips.mode=pypies -Dqpid.dest_syntax=BURL -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j.configuration=log4j-viz-core.xml</vmArgs>
       <vmArgsWin>-Dfile.encoding=UTF-8</vmArgsWin>
    </launcherArgs>
 
@@ -36,7 +36,6 @@
    </launcher>
 
    <vm>
-      <linux include="true">jdk1.6.0</linux>
       <windows include="true">jdk1.6.0</windows>
    </vm>
 

cots/org.apache.log4j/log4j.xml

@@ -44,15 +44,6 @@
       </layout>
    </appender-->
    
-   <appender name="AlertVizInternalLogAppender" class="org.apache.log4j.rolling.RollingFileAppender">
-      <rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
-         <param name="FileNamePattern" value="${user.home}/caveData/logs/alertviz-%d{yyyyMMdd}.log"/>
-      </rollingPolicy> 
-      <layout class="org.apache.log4j.PatternLayout"> 
-         <param name="ConversionPattern" value="%-5p %d [%t] %c{1}: %m%n"/> 
-      </layout>
-   </appender> 
-   
    <logger name="gov.noaa.nws.ncep">
       <level value="INFO"/>
       <appender-ref ref="NcepILogAppender"/>
@@ -65,11 +56,6 @@
       <appender-ref ref="NcepDailyRollingFileAppender"/>
    </logger>
 
-   <logger name="AlertVizLogger" additivity="false">
-      <level value="ALL"/>
-      <appender-ref ref="AlertVizInternalLogAppender"/>
-   </logger>
-
    <logger name="com.raytheon">
       <level value="INFO"/>
    </logger>

edexOsgi/com.raytheon.uf.common.message/src/com/raytheon/uf/common/message/StatusMessage.java

@@ -21,6 +21,7 @@ package com.raytheon.uf.common.message;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.lang.management.ManagementFactory;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -62,8 +63,6 @@ public class StatusMessage implements ISerializableObject, IMessage {
 
     private static final int MAX_MESSAGE_LENGTH = 1024;
 
-    private static final String LOCAL = "LOCAL";
-
     /**
      * The source of the message
      */
@@ -162,7 +161,7 @@ public class StatusMessage implements ISerializableObject, IMessage {
         this.category = category;
         this.priority = priority;
         this.plugin = plugin;
-        this.setMachine(LOCAL);
+        this.setMachineToCurrent();
         buildMessageAndDetails(message, throwable, this);
     }
 
@@ -287,6 +286,13 @@ public class StatusMessage implements ISerializableObject, IMessage {
         this.machine = machine;
     }
 
+    /**
+     * Set to the current machine.
+     */
+    public void setMachineToCurrent() {
+        this.machine = ManagementFactory.getRuntimeMXBean().getName();
+    }
+
     /**
      * @return the message
      */
@@ -405,7 +411,6 @@ public class StatusMessage implements ISerializableObject, IMessage {
 
     @Override
     public String toString() {
-        Priority p = getPriority();
         String statusMsg = getMessage();
         String detailsMsg = getDetails();
         boolean useBothMsgs = detailsMsg.length() > statusMsg.length();

edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/EDEXUtil.java

@@ -237,7 +237,7 @@ public class EDEXUtil implements ApplicationContextAware {
         sm.setPlugin(pluginName);
         sm.setCategory(category);
         sm.setMessage(message);
-        sm.setMachine(Integer.toString(getServerId()));
+        sm.setMachineToCurrent();
         sm.setSourceKey(source);
         sm.setDetails(details);
         sm.setEventTime(new Date());