Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "rda_python_common"
version = "1.0.26"
version = "1.0.27"
authors = [
{ name="Zaihua Ji", email="zji@ucar.edu" },
]
Expand Down
8 changes: 5 additions & 3 deletions src/rda_python_common/PgDBI.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ def SETPGDBI(name, value):
PGDBI['DBSHOST'] = PgLOG.get_short_host(PGDBI['DBHOST'])
PGDBI['DEFSHOST'] = PgLOG.get_short_host(PGDBI['DEFHOST'])
PGDBI['VWHOST'] = PgLOG.PGLOG['PVIEWHOST']
PGDBI['MSHOST'] = PgLOG.PGLOG['PMISCHOST']
PGDBI['VWSHOST'] = PgLOG.get_short_host(PGDBI['VWHOST'])
PGDBI['MSSHOST'] = PgLOG.get_short_host(PGDBI['MSHOST'])
PGDBI['VWHOME'] = (VIEWHOMES[PgLOG.PGLOG['HOSTNAME']] if PgLOG.PGLOG['HOSTNAME'] in VIEWHOMES else VIEWHOMES['default'])
PGDBI['SCPATH'] = None # additional schema path for set search_path
PGDBI['VHSET'] = 0
Expand Down Expand Up @@ -142,23 +144,23 @@ def dssdb_dbname():
# set default connection for obsua PostgreSQL Server
#
def obsua_dbname():
default_scinfo('upadb', 'obsua', "rda-pgdb-03.ucar.edu")
default_scinfo('upadb', 'obsua', PgLOG.PGLOG['PMISCHOST'])

obsua_scname = obsua_dbname

#
# set default connection for ivaddb PostgreSQL Server
#
def ivaddb_dbname():
default_scinfo('ivaddb', 'ivaddb', "rda-pgdb-03.ucar.edu")
default_scinfo('ivaddb', 'ivaddb', PgLOG.PGLOG['PMISCHOST'])

ivaddb_scname = ivaddb_dbname

#
# set default connection for ispddb PostgreSQL Server
#
def ispddb_dbname():
default_scinfo('ispddb', 'ispddb', "rda-pgdb-03.ucar.edu")
default_scinfo('ispddb', 'ispddb', PgLOG.PGLOG['PMISCHOST'])

ispddb_scname = ispddb_dbname

Expand Down
3 changes: 2 additions & 1 deletion src/rda_python_common/PgLOG.py
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,8 @@ def set_common_pglog():
SETPGLOG("SLMHOSTS", "cheyenne:casper") # host names for SLURM server
SETPGLOG("PBSHOSTS", "cheyenne:casper") # host names for PBS server
SETPGLOG("CHKHOSTS", "") # host names for dscheck daemon
SETPGLOG("PVIEWHOST", "rda-pgdb-02.ucar.edu") # host name for view only postgresql server
SETPGLOG("PVIEWHOST", "rda-pgdb-02.ucar.edu") # host name for view only postgresql server
SETPGLOG("PMISCHOST", "rda-pgdb-03.ucar.edu") # host name for misc postgresql server
SETPGLOG("FTPUPLD", PGLOG['TRANSFER']+"/rossby") # ftp upload path
PGLOG['GPFSROOTS'] = "{}|{}|{}".format(PGLOG['DSDHOME'], PGLOG['UPDTWKP'], PGLOG['RQSTHOME'])

Expand Down