Skip to content

Commit 995c470

Browse files
authored
Merge pull request #32 from NCAR/hua-work-common
observe environment PMISCHOST
2 parents 78e1021 + 75a21f1 commit 995c470

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "rda_python_common"
7-
version = "1.0.26"
7+
version = "1.0.27"
88
authors = [
99
{ name="Zaihua Ji", email="zji@ucar.edu" },
1010
]

src/rda_python_common/PgDBI.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ def SETPGDBI(name, value):
105105
PGDBI['DBSHOST'] = PgLOG.get_short_host(PGDBI['DBHOST'])
106106
PGDBI['DEFSHOST'] = PgLOG.get_short_host(PGDBI['DEFHOST'])
107107
PGDBI['VWHOST'] = PgLOG.PGLOG['PVIEWHOST']
108+
PGDBI['MSHOST'] = PgLOG.PGLOG['PMISCHOST']
108109
PGDBI['VWSHOST'] = PgLOG.get_short_host(PGDBI['VWHOST'])
110+
PGDBI['MSSHOST'] = PgLOG.get_short_host(PGDBI['MSHOST'])
109111
PGDBI['VWHOME'] = (VIEWHOMES[PgLOG.PGLOG['HOSTNAME']] if PgLOG.PGLOG['HOSTNAME'] in VIEWHOMES else VIEWHOMES['default'])
110112
PGDBI['SCPATH'] = None # additional schema path for set search_path
111113
PGDBI['VHSET'] = 0
@@ -142,23 +144,23 @@ def dssdb_dbname():
142144
# set default connection for obsua PostgreSQL Server
143145
#
144146
def obsua_dbname():
145-
default_scinfo('upadb', 'obsua', "rda-pgdb-03.ucar.edu")
147+
default_scinfo('upadb', 'obsua', PgLOG.PGLOG['PMISCHOST'])
146148

147149
obsua_scname = obsua_dbname
148150

149151
#
150152
# set default connection for ivaddb PostgreSQL Server
151153
#
152154
def ivaddb_dbname():
153-
default_scinfo('ivaddb', 'ivaddb', "rda-pgdb-03.ucar.edu")
155+
default_scinfo('ivaddb', 'ivaddb', PgLOG.PGLOG['PMISCHOST'])
154156

155157
ivaddb_scname = ivaddb_dbname
156158

157159
#
158160
# set default connection for ispddb PostgreSQL Server
159161
#
160162
def ispddb_dbname():
161-
default_scinfo('ispddb', 'ispddb', "rda-pgdb-03.ucar.edu")
163+
default_scinfo('ispddb', 'ispddb', PgLOG.PGLOG['PMISCHOST'])
162164

163165
ispddb_scname = ispddb_dbname
164166

src/rda_python_common/PgLOG.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,8 @@ def set_common_pglog():
13221322
SETPGLOG("SLMHOSTS", "cheyenne:casper") # host names for SLURM server
13231323
SETPGLOG("PBSHOSTS", "cheyenne:casper") # host names for PBS server
13241324
SETPGLOG("CHKHOSTS", "") # host names for dscheck daemon
1325-
SETPGLOG("PVIEWHOST", "rda-pgdb-02.ucar.edu") # host name for view only postgresql server
1325+
SETPGLOG("PVIEWHOST", "rda-pgdb-02.ucar.edu") # host name for view only postgresql server
1326+
SETPGLOG("PMISCHOST", "rda-pgdb-03.ucar.edu") # host name for misc postgresql server
13261327
SETPGLOG("FTPUPLD", PGLOG['TRANSFER']+"/rossby") # ftp upload path
13271328
PGLOG['GPFSROOTS'] = "{}|{}|{}".format(PGLOG['DSDHOME'], PGLOG['UPDTWKP'], PGLOG['RQSTHOME'])
13281329

0 commit comments

Comments
 (0)