valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use proper variable names

Browse Source
This commit is contained in:
Pedro Algarvio 2014-02-10 12:43:04 +00:00
parent f222d896dc
commit 7c60ca4189
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/minion.py
View File

@ -1351,13 +1351,13 @@ class Minion(object):
except Exception: except Exception:
log.debug('Exception while handling events', exc_info=True) log.debug('Exception while handling events', exc_info=True)
except zmq.ZMQError as e: except zmq.ZMQError as exc:
# The interrupt caused by python handling the # The interrupt caused by python handling the
# SIGCHLD. Throws this error with errno == EINTR. # SIGCHLD. Throws this error with errno == EINTR.
# Nothing to recieve on the zmq socket throws this error # Nothing to recieve on the zmq socket throws this error
# with EAGAIN. # with EAGAIN.
# Both are safe to ignore # Both are safe to ignore
if e.errno != errno.EAGAIN and e.errno != errno.EINTR: if exc.errno != errno.EAGAIN and exc.errno != errno.EINTR:
log.critical('Unexpected ZMQError while polling minion', log.critical('Unexpected ZMQError while polling minion',
exc_info=True) exc_info=True)
continue continue