saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #45031 from terminalmage/fix-mysql-returner

Browse source 
Fix invalid exception class in mysql returner
This commit is contained in:
Nicole Thomas 2017-12-15 10:00:14 -05:00 • committed by GitHub
commit 10de468f13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/returners/mysql.py
View file

@ -470,7 +470,7 @@ def _purge_jobs(timestamp):
except MySQLdb.Error as e:
log.error('mysql returner archiver was unable to delete contents of table \'jids\'')
log.error(str(e))
raise salt.exceptions.Salt(str(e))
raise salt.exceptions.SaltRunnerError(str(e))
try:
sql = 'delete from `salt_returns` where alter_time < %s'
@ -479,7 +479,7 @@ def _purge_jobs(timestamp):
except MySQLdb.Error as e:
log.error('mysql returner archiver was unable to delete contents of table \'salt_returns\'')
log.error(str(e))
raise salt.exceptions.Salt(str(e))
raise salt.exceptions.SaltRunnerError(str(e))
try:
sql = 'delete from `salt_events` where alter_time < %s'
@ -488,7 +488,7 @@ def _purge_jobs(timestamp):
except MySQLdb.Error as e:
log.error('mysql returner archiver was unable to delete contents of table \'salt_events\'')
log.error(str(e))
raise salt.exceptions.Salt(str(e))
raise salt.exceptions.SaltRunnerError(str(e))
return True
@ -571,4 +571,4 @@ def clean_old_jobs():
except MySQLdb.Error as e:
log.error('Mysql returner was unable to get timestamp for purge/archive of jobs')
log.error(str(e))
raise salt.exceptions.Salt(str(e))
raise salt.exceptions.SaltRunnerError(str(e))