From e04988d5d2b4b7b9d85921354920d0e1e0eea1ac Mon Sep 17 00:00:00 2001 From: David Lovely Date: Tue, 24 Feb 2015 08:19:22 -0600 Subject: [PATCH] Omaha #4164 Fixed AlertViz communications issue and log file directories. Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389 Former-commit-id: 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369 --- cave/build/static/win32.amd64/alertviz/alertviz.bat | 8 ++++++-- cave/build/static/win32.amd64/cave/cave.bat | 9 +++++++-- .../uf/viz/thinclient/cave/ThinClientComponent.java | 2 ++ .../ui/personalities/awips/AbstractAWIPSComponent.java | 8 ++++++++ 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/cave/build/static/win32.amd64/alertviz/alertviz.bat b/cave/build/static/win32.amd64/alertviz/alertviz.bat index a5da035812..6798716f96 100644 --- a/cave/build/static/win32.amd64/alertviz/alertviz.bat +++ b/cave/build/static/win32.amd64/alertviz/alertviz.bat @@ -41,8 +41,8 @@ SET A2_JAVA_REG= SET A2_PYTHON_REG= REM Determine where we will be logging to. -SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH% -SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs +SET HOME_DIRECTORY=%USERPROFILE% +SET CAVEDATA_LOG_DIRECTORY=%HOME_DIRECTORY%\caveData\logs SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME% IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%") @@ -58,6 +58,10 @@ REM instead of -formatter- strings like Linux allows. python -c "from datetime import datetime; print datetime.now().strftime('%%Y%%m%%d_%%H%%M%%S');" > %RND_DATETIME_FILE% SET /p LOG_DATETIME= < %RND_DATETIME_FILE% DEL %RND_DATETIME_FILE% + +SET LOGFILE_CONSOLE=%CAVEDATA_LOG_DIRECTORY%\alertviz_%LOG_DATETIME%_console.log +SET LOGFILE_ALERTVIZ=%CAVEDATA_LOG_DIRECTORY%\alertviz_%LOG_DATETIME%_admin.log + "%CONTAINING_DIRECTORY%alertviz.exe" %* > "%CONSOLE_LOG_DIRECTORY%\alertviz_%LOG_DATETIME%.log" 2>&1 IF %ERRORLEVEL% == 0 (EXIT) echo Restarting AlertViz. diff --git a/cave/build/static/win32.amd64/cave/cave.bat b/cave/build/static/win32.amd64/cave/cave.bat index 5ea5df3de3..6a42f2ec40 100644 --- a/cave/build/static/win32.amd64/cave/cave.bat +++ b/cave/build/static/win32.amd64/cave/cave.bat @@ -44,8 +44,8 @@ SET A2_JAVA_REG= SET A2_PYTHON_REG= REM Determine where we will be logging to. -SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH% -SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs +SET HOME_DIRECTORY=%USERPROFILE% +SET CAVEDATA_LOG_DIRECTORY=%HOME_DIRECTORY%\caveData\logs SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME% IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%") @@ -59,6 +59,11 @@ python -c "from datetime import datetime; print datetime.now().strftime('%%Y%%m% SET /p LOG_DATETIME= < %RND_DATETIME_FILE% DEL %RND_DATETIME_FILE% +SET LOGFILE_CAVE=%CAVEDATA_LOG_DIRECTORY%\cave_%LOG_DATETIME%_logs.log +SET LOGFILE_CONSOLE=%CAVEDATA_LOG_DIRECTORY%\cave_%LOG_DATETIME%_console.log +SET LOGFILE_PERFORMANCE=%CAVEDATA_LOG_DIRECTORY%\cave_%LOG_DATETIME%_perf.log +SET LOGFILE_PRODUCT_EDITOR=%CAVEDATA_LOG_DIRECTORY%\cave_%LOG_DATETIME%_productEditor.log + echo THIS CMD WINDOW CAN BE CLOSED AT ANY TIME! cd %HOMEPATH% REM Start CAVE. diff --git a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java index aa05189115..82472b50b8 100644 --- a/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java +++ b/cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java @@ -71,6 +71,7 @@ import com.raytheon.viz.ui.personalities.awips.CAVE; * Nov 14, 2013 2361 njensen Remove initializeSerialization() * Nov 06, 2014 3356 njensen Always initialize ILocalizationAdapter * in case cache preference is not enabled + * Feb 23, 2015 4164 dlovely Call AlertViz initialize. * * * @@ -211,6 +212,7 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent { // JMS Enabled, register product alerts registerProductAlerts(); } + initializeAlertViz(); } @Override diff --git a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java index 1521625b16..b05d73f19d 100644 --- a/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java +++ b/cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java @@ -64,6 +64,7 @@ import com.raytheon.uf.viz.personalities.cave.component.CAVEApplication; * startComponent. * Aug 26, 2014 3356 njensen Explicitly set localization adapter * Sep 10, 2014 3612 mschenke Refactored to extend CAVEApplication + * Feb 23, 2015 4164 dlovely Extracted AlertViz initialize. * * * @@ -200,6 +201,13 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication { @Override protected void initializeObservers() { super.initializeObservers(); + initializeAlertViz(); + } + + /** + * Initialize AlertViz. + */ + protected void initializeAlertViz() { // Setup AlertViz observer if ((getRuntimeModes() & ALERT_VIZ) != 0) { // Set up alertviz