rda-python-dscheck 1.0.7__tar.gz → 1.0.8__tar.gz

{rda_python_dscheck-1.0.7 → rda_python_dscheck-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 1.0.7
+Version: 1.0.8
 Summary: RDA python package to add and process batch jobs
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dscheck

{rda_python_dscheck-1.0.7 → rda_python_dscheck-1.0.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_dscheck"
-version = "1.0.7"
+version = "1.0.8"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

{rda_python_dscheck-1.0.7 → rda_python_dscheck-1.0.8}/src/rda_python_dscheck/PgCheck.py

@@ -405,7 +405,7 @@ def check_dscheck_locks(cnd, logact = 0):
    dtime = ltime - PgSIG.PGSIG['DTIME']
    ctime = ltime - PgSIG.PGSIG['CTIME']
    rtime = ltime - PgSIG.PGSIG['RTIME']
-   cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost = '{}' OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)
+   cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost {} OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, CHKHOST['hostcond'], rtime)
 
    pgrecs = PgDBI.pgmget("dscheck", "*", cnd, logact)
    cnt = (len(pgrecs['cindex']) if pgrecs else 0)
@@ -1097,7 +1097,7 @@ def check_dsrqst_locks(cnd, logact = 0):
    dtime = ltime - PgSIG.PGSIG['DTIME']
    ctime = ltime - PgSIG.PGSIG['CTIME']
    rtime = ltime - PgSIG.PGSIG['RTIME']
-   cnd += "locktime > 0 AND (locktime < {} OR locktime < {} AND lockhost = '{}' OR locktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)
+   cnd += "locktime > 0 AND (locktime < {} OR locktime < {} AND lockhost {} OR locktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, CHKHOST['hostcond'], rtime)
    check_partition_locks(cnd, ltime, logact)   # check partitions first
 
    pgrecs = PgDBI.pgmget("dsrqst", "rindex, lockhost, pid, locktime", cnd, logact)
@@ -1304,7 +1304,7 @@ def check_dsupdt_locks(ocnd, logact = 0):
    cnd = ocnd + "pid > 0 AND "
    ctime = ltime - 4*PgSIG.PGSIG['CTIME']
    rtime = ltime - PgSIG.PGSIG['RTIME']
-   cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost = '{}' OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, lochost, rtime)
+   cnd += "chktime > 0 AND (chktime < {} OR chktime < {} AND lockhost {} OR chktime < {} AND lockhost = 'rda_config')".format(ctime, dtime, CHKHOST['hostcond'], rtime)
 
    pgrecs = PgDBI.pgmget("dcupdt", "cindex, lockhost, pid, chktime", cnd, logact)
    cnt = (len(pgrecs['cindex']) if pgrecs else 0)
@@ -1335,7 +1335,7 @@ def check_dsupdt_locks(ocnd, logact = 0):
    if cnt > 1: PgLOG.pglog("{} of {} DSUPDT Controls unlocked on {}".format(lcnt, cnt, PgLOG.PGLOG['HOSTNAME']), PgLOG.WARNLG)
 
    cnd = ocnd + "pid > 0 AND locktime > 0 AND "
-   cnd += "(locktime < {} OR locktime < {} AND hostname = '{}' OR locktime < {} AND hostname = 'rda_config')".format(ctime, dtime, lochost, rtime)
+   cnd += "(locktime < {} OR locktime < {} AND hostname {} OR locktime < {} AND hostname = 'rda_config')".format(ctime, dtime, CHKHOST['hostcond'], rtime)
 
    pgrecs = PgDBI.pgmget("dlupdt", "lindex, hostname, pid, locktime", cnd, logact)
    cnt = (len(pgrecs['lindex']) if pgrecs else 0)

{rda_python_dscheck-1.0.7 → rda_python_dscheck-1.0.8}/src/rda_python_dscheck.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 1.0.7
+Version: 1.0.8
 Summary: RDA python package to add and process batch jobs
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dscheck