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 = "2.0.10"
version = "2.0.12"
authors = [
{ name="Zaihua Ji", email="[email protected]" },
]
Expand Down
2 changes: 2 additions & 0 deletions src/rda_python_common/PgDBI.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,8 @@ def check_dberror(pgerr, pgcnt, sqlstr, ary, logact = PGDBI['ERRLOG']):

if logact&PgLOG.DOLOCK and pgcode and re.match(r'^55\w\w\w$', pgcode):
logact &= ~PgLOG.EXITLG # no exit for lock error
elif pgcnt > PgLOG.PGLOG['DBRETRY']:
logact |= PgLOG.EXITLG # exit for error count exceeds limit
return qelog(dberror, 0, sqlstr, ary, pgcnt, logact)

#
Expand Down
2 changes: 2 additions & 0 deletions src/rda_python_common/pg_dbi.py
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,8 @@ def check_dberror(self, pgerr, pgcnt, sqlstr, ary, logact = None):
return self.SUCCESS
if logact&self.DOLOCK and pgcode and re.match(r'^55\w\w\w$', pgcode):
logact &= ~self.EXITLG # no exit for lock error
elif pgcnt > self.PGLOG['DBRETRY']:
logact |= self.EXITLG # exit for error count exceeds limit
return self.qelog(dberror, 0, sqlstr, ary, pgcnt, logact)

# return hash reference to postgresql batch mode command and output file name
Expand Down
2 changes: 1 addition & 1 deletion src/rda_python_common/pg_opt.py
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ def send_request_email_notice(self, pgrqst, errmsg, fcount, rstat, readyfile = N
rf.write(ebuf)
rf.close()
self.set_local_mode(readyfile, 1, self.PGLOG['FILEMODE'])
return rstat
return rstat

# cache partition process error to existing email buffer
def cache_partition_email_error(self, ridx, errmsg):
Expand Down