rda-python-common 2.0.10__tar.gz → 2.0.12__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (33) hide show
  1. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/PKG-INFO +1 -1
  2. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/pyproject.toml +1 -1
  3. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgDBI.py +2 -0
  4. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_dbi.py +2 -0
  5. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_opt.py +1 -1
  6. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common.egg-info/PKG-INFO +1 -1
  7. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/LICENSE +0 -0
  8. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/README.md +0 -0
  9. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/setup.cfg +0 -0
  10. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgCMD.py +0 -0
  11. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgFile.py +0 -0
  12. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgLOG.py +0 -0
  13. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgLock.py +0 -0
  14. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgOPT.py +0 -0
  15. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgSIG.py +0 -0
  16. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgSplit.py +0 -0
  17. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/PgUtil.py +0 -0
  18. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/__init__.py +0 -0
  19. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_cmd.py +0 -0
  20. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_file.py +0 -0
  21. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_lock.py +0 -0
  22. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_log.py +0 -0
  23. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_password.py +0 -0
  24. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_sig.py +0 -0
  25. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_split.py +0 -0
  26. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pg_util.py +0 -0
  27. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common/pgpassword.py +0 -0
  28. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common.egg-info/SOURCES.txt +0 -0
  29. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common.egg-info/dependency_links.txt +0 -0
  30. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common.egg-info/entry_points.txt +0 -0
  31. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common.egg-info/requires.txt +0 -0
  32. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/src/rda_python_common.egg-info/top_level.txt +0 -0
  33. {rda_python_common-2.0.10 → rda_python_common-2.0.12}/test/test_common.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_common
3
- Version: 2.0.10
3
+ Version: 2.0.12
4
4
  Summary: RDA Python common library codes shared by other RDA python packages
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-common
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "rda_python_common"
7
- version = "2.0.10"
7
+ version = "2.0.12"
8
8
  authors = [
9
9
  { name="Zaihua Ji", email="zji@ucar.edu" },
10
10
  ]
@@ -468,6 +468,8 @@ def check_dberror(pgerr, pgcnt, sqlstr, ary, logact = PGDBI['ERRLOG']):
468
468
 
469
469
  if logact&PgLOG.DOLOCK and pgcode and re.match(r'^55\w\w\w$', pgcode):
470
470
  logact &= ~PgLOG.EXITLG # no exit for lock error
471
+ elif pgcnt > PgLOG.PGLOG['DBRETRY']:
472
+ logact |= PgLOG.EXITLG # exit for error count exceeds limit
471
473
  return qelog(dberror, 0, sqlstr, ary, pgcnt, logact)
472
474
 
473
475
  #
@@ -366,6 +366,8 @@ class PgDBI(PgLOG):
366
366
  return self.SUCCESS
367
367
  if logact&self.DOLOCK and pgcode and re.match(r'^55\w\w\w$', pgcode):
368
368
  logact &= ~self.EXITLG # no exit for lock error
369
+ elif pgcnt > self.PGLOG['DBRETRY']:
370
+ logact |= self.EXITLG # exit for error count exceeds limit
369
371
  return self.qelog(dberror, 0, sqlstr, ary, pgcnt, logact)
370
372
 
371
373
  # return hash reference to postgresql batch mode command and output file name
@@ -1435,7 +1435,7 @@ class PgOPT(PgFile):
1435
1435
  rf.write(ebuf)
1436
1436
  rf.close()
1437
1437
  self.set_local_mode(readyfile, 1, self.PGLOG['FILEMODE'])
1438
- return rstat
1438
+ return rstat
1439
1439
 
1440
1440
  # cache partition process error to existing email buffer
1441
1441
  def cache_partition_email_error(self, ridx, errmsg):
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: rda_python_common
3
- Version: 2.0.10
3
+ Version: 2.0.12
4
4
  Summary: RDA Python common library codes shared by other RDA python packages
5
5
  Author-email: Zaihua Ji <zji@ucar.edu>
6
6
  Project-URL: Homepage, https://github.com/NCAR/rda-python-common