xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #4164 Fixed AlertViz communications issue and log file directories.

Browse source 
Change-Id: I8bd038487d9d2bda371915b3eb5680118429f389

Former-commit-id: 7e61e1d6b80ba69bcbed3e8bc51d56d2811d6369
This commit is contained in:
David Lovely 2015-02-24 08:19:22 -06:00
parent a83d163c1b
commit e04988d5d2
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/build/static/win32.amd64/alertviz/alertviz.bat
View file

@ -41,8 +41,8 @@ SET A2_JAVA_REG=
SET A2_PYTHON_REG= SET A2_PYTHON_REG=
REM Determine where we will be logging to. REM Determine where we will be logging to.
SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH% SET HOME_DIRECTORY=%USERPROFILE%
SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs SET CAVEDATA_LOG_DIRECTORY=%HOME_DIRECTORY%\caveData\logs
SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME% SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME%
IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%") 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% 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% SET /p LOG_DATETIME= < %RND_DATETIME_FILE%
DEL %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 "%CONTAINING_DIRECTORY%alertviz.exe" %* > "%CONSOLE_LOG_DIRECTORY%\alertviz_%LOG_DATETIME%.log" 2>&1
IF %ERRORLEVEL% == 0 (EXIT) IF %ERRORLEVEL% == 0 (EXIT)
echo Restarting AlertViz. echo Restarting AlertViz.

9
cave/build/static/win32.amd64/cave/cave.bat
View file

@ -44,8 +44,8 @@ SET A2_JAVA_REG=
SET A2_PYTHON_REG= SET A2_PYTHON_REG=
REM Determine where we will be logging to. REM Determine where we will be logging to.
SET HOME_DIRECTORY=%HOMEDRIVE%%HOMEPATH% SET HOME_DIRECTORY=%USERPROFILE%
SET CAVEDATA_LOG_DIRECTORY=%HOMEDRIVE%%HOMEPATH%\caveData\logs SET CAVEDATA_LOG_DIRECTORY=%HOME_DIRECTORY%\caveData\logs
SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME% SET CONSOLE_LOG_DIRECTORY=%CAVEDATA_LOG_DIRECTORY%\consoleLogs\%COMPUTERNAME%
IF NOT EXIST "%CONSOLE_LOG_DIRECTORY%" (MKDIR "%CONSOLE_LOG_DIRECTORY%") 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% SET /p LOG_DATETIME= < %RND_DATETIME_FILE%
DEL %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! echo THIS CMD WINDOW CAN BE CLOSED AT ANY TIME!
cd %HOMEPATH% cd %HOMEPATH%
REM Start CAVE. REM Start CAVE.

2
cave/com.raytheon.uf.viz.thinclient.cave/src/com/raytheon/uf/viz/thinclient/cave/ThinClientComponent.java
View file

@ -71,6 +71,7 @@ import com.raytheon.viz.ui.personalities.awips.CAVE;
* Nov 14, 2013 2361 njensen Remove initializeSerialization() * Nov 14, 2013 2361 njensen Remove initializeSerialization()
* Nov 06, 2014 3356 njensen Always initialize ILocalizationAdapter * Nov 06, 2014 3356 njensen Always initialize ILocalizationAdapter
* in case cache preference is not enabled * in case cache preference is not enabled
* Feb 23, 2015 4164 dlovely Call AlertViz initialize.
* *
* </pre> * </pre>
* *
@ -211,6 +212,7 @@ public class ThinClientComponent extends CAVE implements IThinClientComponent {
// JMS Enabled, register product alerts // JMS Enabled, register product alerts
registerProductAlerts(); registerProductAlerts();
} }
initializeAlertViz();
} }
@Override @Override

8
cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractAWIPSComponent.java
View file

@ -64,6 +64,7 @@ import com.raytheon.uf.viz.personalities.cave.component.CAVEApplication;
* startComponent. * startComponent.
* Aug 26, 2014 3356 njensen Explicitly set localization adapter * Aug 26, 2014 3356 njensen Explicitly set localization adapter
* Sep 10, 2014 3612 mschenke Refactored to extend CAVEApplication * Sep 10, 2014 3612 mschenke Refactored to extend CAVEApplication
* Feb 23, 2015 4164 dlovely Extracted AlertViz initialize.
* *
* </pre> * </pre>
* *
@ -200,6 +201,13 @@ public abstract class AbstractAWIPSComponent extends CAVEApplication {
@Override @Override
protected void initializeObservers() { protected void initializeObservers() {
super.initializeObservers(); super.initializeObservers();
initializeAlertViz();
}
/**
* Initialize AlertViz.
*/
protected void initializeAlertViz() {
// Setup AlertViz observer // Setup AlertViz observer
if ((getRuntimeModes() & ALERT_VIZ) != 0) { if ((getRuntimeModes() & ALERT_VIZ) != 0) {
// Set up alertviz // Set up alertviz