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

GFESuite port number and servername edits

Browse source
This commit is contained in:
mjames-upc 2015-11-06 11:28:26 -07:00
parent 7b3f08ae01
commit 2320d61438
11 changed files with 24 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/TextFormatter.py
View file

@ -957,7 +957,7 @@ Usage: python TextFormatter.py
[-S server controlled output file -- default None]
[-A append text to given file name]
[-h host -- default orca.fsl.noaa.gov]
[-p port -- default 98000000]
[-p port -- default 9583]
[-l language -- english, french, spanish: default english]
[-z displaced real time -- format YYYYMMDD_HHMM]
[-T] Generates a "TEST" product.

2
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/TextFormatter.java
View file

@ -187,7 +187,7 @@ public class TextFormatter extends AbstractGfeTask {
@Override
public String getCommand() {
/*
* runIFPText -t "ZFP_OAX" -h localhost -p 98000000 -d
* runIFPText -t "ZFP_OAX" -h localhost -p 9583 -d
* OAX_GRID__Official_00000000_0000 -u "fxa" -S -V
* "{('Product Issuance','productIssuance'): 'Morning', (Issued By, 'issuedBy'): None}"
* -a active

10
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/IrtAccess.py
View file

@ -577,12 +577,10 @@ class IrtAccess():
# server search list in priority. The px3 entries are used for
# dual domain for AFC.
#hp = [('dx4','98000000'),('px3', '98000000'), ('dx4','98000001'),
# ('px3', '98000001')]
# 2015-09-07 mjames@ucar
hp = [('localhost','98000000'),('localhost','98000001')]
# 2015-11-06 mjames@ucar
hp = [('localhost','9583')]
# choose one server from this domain, find first dx4, 98000000
# choose one server from this domain, find first dx4, 9583
# try to use one with the same mhsidDest as the site, which
# would be the primary operational GFE. Note that the px3 entries
# are for AFC.
@ -599,7 +597,7 @@ class IrtAccess():
found = True
break
# find first dx4, 98000000, but perhaps a different mhsid
# find first dx4, 9583, but perhaps a different mhsid
# this is probably not the primary operational GFE
for matchServer, matchPort in hp:
if found:

8
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscDataRec.py
View file

@ -111,16 +111,16 @@ def execIscDataRec(MSGID,SUBJECT,FILES):
logProblem("Malformed XML received")
return
#no XML destination information. Default to dx4f,px3 98000000, 98000001
#no XML destination information. Default to 9583
else:
# create a xml element tree to replace the missing one. This will
# occur when OB8.2 sites send ISC data to OB8.3 sites, and also when
# active table exchanges occur. We default to 98000000 and 98000001
# on dx4 since that is where the primary and svcbu servers are located.
# active table exchanges occur. We default to 9583
# since that is where the primary and svcbu servers are located.
# This will cause log errors until everyone is on OB8.3.
iscE = Element('isc')
destinationsE = SubElement(iscE, 'destinations')
for x in xrange(98000000, 98000002):
for x in xrange(9583, 9583):
for shost in ['localhost']:
addressE = SubElement(destinationsE, 'address')
serverE = SubElement(addressE, 'server')

10
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
View file

@ -113,7 +113,7 @@ def serverBoxText(server):
#returns text based on the server dictionary that should be placed
#into the dialog
hostport = None
if server['port'] == "98000000":
if server['port'] == "9583":
hostport = server['host'] + "-primary"
elif server['port'] == "98000001":
hostport = server['host'] + "-svcbu"
@ -127,10 +127,6 @@ def serverBoxText(server):
def sortServers(a, b):
# sort function for the list of servers. Sorts in priority order for
# most likely to have the data. Order is:
# dx4 or px3 98000000 site==mhsid
# dx4 or px3 98000001 site==mhsid
# dx4 or px3 98000000 site!=mhsid
# dx4 or px3 98000001 site!=mhsid
# all others in random order.
sameSiteA = (a['mhsid'] == a['site'])
sameSiteB = (b['mhsid'] == b['site'])
@ -140,8 +136,8 @@ def sortServers(a, b):
return 1
#both are same sites, check for host next
else:
regPortA = (a['port'] == "98000000")
regPortB = (b['port'] == "98000000")
regPortA = (a['port'] == "9583")
regPortB = (b['port'] == "9583")
if regPortA and not regPortB:
return -1
elif not regPortA and regPortB:

4
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
View file

@ -240,8 +240,8 @@ mpe_display_maps : statesCounties
# database selection tokens
server_name : ONLINE # Informix database server name
db_name : hd_ob92lwx # IHFS database name
damcat_db_name : dc_ob5xxx # Dam Catalog database name
db_name : hd_ob92oax # IHFS database name
damcat_db_name : dc_ob7oax # Dam Catalog database name
hdb_db_name : ob81_histdata # Historical database.
pghost : localhost # The machine PostGres is running on
pguser : awips # The user allowed to access PostGres

6
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/sendAT.py
View file

@ -194,9 +194,9 @@ def execute_send_at(myServerHost, myServerPort, myServerProtocol,
else:
servers = []
for mhss in mhsSites:
for port in xrange(98000000, 98000002):
for port in xrange(9583, 9583):
for site in sites:
for host in ['dx4f','px3']:
for host in ['localhost']:
destServer = {'mhsid': mhss, 'host': host,
'port': port, 'protocol': "20070723",
'site': site}
@ -291,4 +291,4 @@ def runFromJava(myServerHost, myServerPort, myServerProtocol, myServerMHSID,
# Finish
#--------------------------------------------------------------------
endT = time.time()
logger.info("Final: wctime: {0:-6.2f}, cputime: {1:-6.2f}".format(endT - startT, time.clock()))
logger.info("Final: wctime: {0:-6.2f}, cputime: {1:-6.2f}".format(endT - startT, time.clock()))

2
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/configuration/svcbu.properties
View file

@ -119,7 +119,7 @@ MSG_SEND_COMMAND=msg_send
CDSPORT=9581
SVCBU_DB=Official
SVCBU_TRIM_ELEMS=1
SVCBU_FAILED_SITE_PORT=98000001
SVCBU_FAILED_SITE_PORT=9583
SVCBU_GRIDAREA=ISC_Send_Area
SVCBU_ADDRESSEE="ANCF,BNCF"
SVCBU_WMO_HEADER=SVCBKPIFP

2
edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config
View file

@ -238,7 +238,7 @@ sed -i "s/$FAILED_MHSID/$BACKUP_MHSID/" ${failed_config}
sed -i "s/$FAILED_SERVER/$BACKUP_SERVER/" ${failed_config}
sed -i "s/$FAILED_LOGDIR/$BACKUP_LOGDIR/" ${failed_config}
sed -i "s/$FAILED_PRDDIR/$BACKUP_PRDDIR/" ${failed_config}
sed -i "s/98000000/$SVCBU_FAILED_SITE_PORT/" ${failed_config}
sed -i "s/9583/$SVCBU_FAILED_SITE_PORT/" ${failed_config}
cd ${SVCBU_HOME}
rm -rf *

4
localization/localization.OAX/utility/edex_static/site/OAX/config/gfe/siteConfig.py
View file

@ -22,9 +22,9 @@
import os, socket
GFESUITE_HOME = os.environ['EDEX_HOME']+"/../GFESuite"
GFESUITE_HOME = "/awips2/GFESuite"
GFESUITE_SERVER = "localhost"
GFESUITE_PORT = '98000000'
GFESUITE_PORT = '9583'
GFESUITE_SITEID = 'OAX'
GFESUITE_PRDDIR = GFESUITE_HOME+"/products"
GFESUITE_LOGDIR = GFESUITE_HOME+"/logs/"+GFESUITE_SITEID

4
localization/localization.TBW/utility/edex_static/site/TBW/config/gfe/siteConfig.py
View file

@ -22,9 +22,9 @@
import os, socket
GFESUITE_HOME = os.environ['EDEX_HOME']+"/../GFESuite"
GFESUITE_HOME = "/awips2/GFESuite"
GFESUITE_SERVER = "localhost"
GFESUITE_PORT = '98000000'
GFESUITE_PORT = '9583'
GFESUITE_SITEID = 'TBW'
GFESUITE_PRDDIR = GFESUITE_HOME+"/products"
GFESUITE_MHSID = 'TBW'