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

Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Browse source 
Former-commit-id: 5ed7f62638 [formerly 5ed7f62638 [formerly 3905161a55f66efb33b1fe4bc016545b367e88c1]]
Former-commit-id: eef951faea
Former-commit-id: c8538cded1
This commit is contained in:
Fay.Liang 2015-02-11 15:36:25 -05:00
commit 788f327e6a
10 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
edexOsgi/build.edex/esb/etc/ingest.sh
View file

@ -20,7 +20,7 @@
##
export INIT_MEM=512 # in Meg
export MAX_MEM=896 # in Meg
export MAX_MEM=1280 # in Meg
export EDEX_DEBUG_PORT=5006
export EDEX_JMX_PORT=1617

2
edexOsgi/build.edex/esb/etc/ingestDat.sh
View file

@ -19,7 +19,7 @@
# further licensing information.
##
export INIT_MEM=256 # in Meg
export MAX_MEM=1792 # in Meg
export MAX_MEM=1856 # in Meg
export METADATA_POOL_MAX=25
export EDEX_DEBUG_PORT=5008

2
edexOsgi/build.edex/esb/etc/ingestGrib.sh
View file

@ -19,7 +19,7 @@
# further licensing information.
##
export INIT_MEM=128 # in Meg
export MAX_MEM=512 # in Meg
export MAX_MEM=544 # in Meg
export METADATA_POOL_MAX=10
export EDEX_DEBUG_PORT=5007

4
edexOsgi/build.edex/esb/etc/request.sh
View file

@ -20,9 +20,9 @@
##
export INIT_MEM=128 # in Meg
if [ "$EDEX_ARCH" == "64-bit" ]; then
export MAX_MEM=2048 # in Meg
export MAX_MEM=2144 # in Meg
else
export MAX_MEM=1280 # in Meg
export MAX_MEM=1376 # in Meg
fi
export SERIALIZE_POOL_MAX_SIZE=24
export SERIALIZE_STREAM_INIT_SIZE_MB=2

1
edexOsgi/com.raytheon.uf.common.dataplugin.text/res/scripts/afosLookupLoader.sql
View file

@ -266,6 +266,7 @@ insert into afoslookup (origin, ccc) values ('KJEF','STL');
insert into afoslookup (origin, ccc) values ('KJFK','NYC');
insert into afoslookup (origin, ccc) values ('KJKL','SDF');
insert into afoslookup (origin, ccc) values ('KKCI','MKC');
insert into afoslookup (origin, ccc) values ('KKEY','MIA');
insert into afoslookup (origin, ccc) values ('KKRF','MKC');
insert into afoslookup (origin, ccc) values ('KLAF','IND');
insert into afoslookup (origin, ccc) values ('KLAN','ARB');

19
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/RunReportAlarmSrv.java
View file

@ -150,19 +150,16 @@ public final class RunReportAlarmSrv {
private static void saveProductToTextDb(final String productText,
final String productId) throws Exception {
TextDB textdb = new TextDB();
long statusCode = textdb.writeProduct(productId, productText, true,
long insertTime = textdb.writeProduct(productId, productText, true,
null);
// Set the current time and send product alarm alert.
Date d = new Date(System.currentTimeMillis());
d.setTime(statusCode);
AlarmAlertUtil.sendProductAlarmAlert(productId,
String.valueOf(d.getTime()),
true);
if (statusCode != Long.MIN_VALUE) {
statusHandler.info("Product successfully sent");
if (insertTime != Long.MIN_VALUE) {
// Set the write time and send product alarm alert.
Date d = new Date();
d.setTime(insertTime);
AlarmAlertUtil.sendProductAlarmAlert(productId, d, true);
statusHandler.info("Saved product to textdb successfully.");
} else {
statusHandler.error("Product send error detected.");
statusHandler.error("Error detected saving product to textdb.");
}
}
}

2
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
View file

@ -1 +1 @@
049e7b47e9c8ce3a9839dac563a90ce743b2446c
b0ccb6afd656a3d8b4e26247bfa669f5f9e31291

5
nativeLib/files.native/awipsShare/hydroapps/precip_proc/bin/transmit_rfc_qpe Executable file → Normal file
View file

@ -49,14 +49,11 @@
#
export PRODUCT_ID=CCCCQPEBIN
export FXA_HOME=/awips/fxa
#
# Set up the D2D environment...
. $FXA_HOME/readenv.sh
RUN_FROM_DIR=`dirname $0`
. $RUN_FROM_DIR/../../../set_hydro_env
. $RUN_FROM_DIR/../../set_hydro_env
export GAQ_LOG_DIR=$(get_apps_defaults gaq_log_dir)
export MPE_SEND_QPE_TO_SBN=$(get_apps_defaults mpe_send_qpe_to_sbn)
export MPE_SAVE_GRIB=$(get_apps_defaults mpe_save_grib)

5
nativeLib/files.native/awipsShare/hydroapps/precip_proc/local/bin/transmit_rfc_qpe Executable file → Normal file
View file

@ -49,14 +49,11 @@
#
export PRODUCT_ID=CCCCQPEBIN
export FXA_HOME=/awips/fxa
#
# Set up the D2D environment...
. $FXA_HOME/readenv.sh
RUN_FROM_DIR=`dirname $0`
. $RUN_FROM_DIR/../../../set_hydro_env
. $RUN_FROM_DIR/../../set_hydro_env
export GAQ_LOG_DIR=$(get_apps_defaults gaq_log_dir)
export MPE_SEND_QPE_TO_SBN=$(get_apps_defaults mpe_send_qpe_to_sbn)
export MPE_SAVE_GRIB=$(get_apps_defaults mpe_save_grib)

2
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so.REMOVED.git-id
View file

@ -1 +1 @@
049e7b47e9c8ce3a9839dac563a90ce743b2446c
b0ccb6afd656a3d8b4e26247bfa669f5f9e31291