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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 1.0.6
+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.6 → 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.6"
+version = "1.0.8"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

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

@@ -367,13 +367,11 @@ def start_dschecks(cnd, logact = 0):
 
    rcnt = 0
    check_dscheck_locks(cnd, logact)
-   if not CHKHOST['chkhost']: email_dschecks(cnd, logact)
+   email_dschecks(cnd, logact)
    purge_dschecks(cnd, logact)
 
-#   if 'NC' in PgOPT.params or not CHKHOST['chkhost']: return 0 
    if 'NC' in PgOPT.params: return 0 
    if CHKHOST['isbatch'] and 'CP' in PgOPT.params: check_dscheck_pends(cnd, logact)
-#   set_dscheck_options(CHKHOST['chkhost'], cnd, logact)
    reset_process_limits()
    if CHKHOST['isbatch']: rcnt = PgDBI.pgget("dscheck", "", "lockhost = '{}' AND pid > 0".format(PgLOG.PGLOG['PBSNAME']), logact)
 
@@ -407,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)
@@ -927,8 +925,7 @@ def skip_dscheck_record(pgrec, host, logact = 0):
 def start_dsrqsts(cnd, logact = 0):
 
    check_dsrqst_locks(cnd, logact)
-#   if CHKHOST['chkhost']: return 1
-   if not CHKHOST['chkhost']: email_dsrqsts(cnd, logact)
+   email_dsrqsts(cnd, logact)
    purge_dsrqsts(cnd, logact)
    rcnd = cnd
    rcnd += ("status = 'Q' AND rqsttype <> 'C' AND (pid = 0 OR pid < ptcount) AND " +
@@ -1100,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)
@@ -1242,9 +1239,8 @@ def start_dsupdts(cnd, logact = 0):
 
    ctime = PgUtil.curtime(1)
    check_dsupdt_locks(cnd, logact)
-   if not CHKHOST['chkhost']:
-      email_dsupdt_controls(cnd, logact)
-      email_dsupdts(cnd, logact)
+   email_dsupdt_controls(cnd, logact)
+   email_dsupdts(cnd, logact)
 
    cnd += "pid = 0 and cntltime <= '{}' and action > '' AND einfo IS NULL ORDER by cntltime".format(ctime)
    pgrecs = PgDBI.pgmget("dcupdt", "*", cnd, logact)
@@ -1308,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)
@@ -1339,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.6 → rda_python_dscheck-1.0.8}/src/rda_python_dscheck/dscheck.py

@@ -602,10 +602,7 @@ def handle_dschecks():
 def send_error_email():
    
    msg = "Error message for DSCHECK on " + PgLOG.PGLOG['HOSTNAME']
-
-   PgLOG.set_email(msg, PgLOG.EMLTOP)
-   msg = PgLOG.send_email(msg)
-   PgLOG.pglog(msg, PgLOG.MSGLOG|PgLOG.FRCLOG)
+   PgLOG.send_email(msg)
 
 #
 # prepare a summary string for quit

{rda_python_dscheck-1.0.6 → 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.6
+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