This commit is contained in:
Mike Place 2016-12-06 11:27:47 -07:00
parent a8ce153252
commit 88e03bba6d
No known key found for this signature in database
GPG key ID: 9136F4F13705CFD3
2 changed files with 2 additions and 2 deletions

View file

@ -127,7 +127,7 @@ def beacon(config):
for func in config:
try:
data = __salt__['status.{0}'.format(func)]()
except salt.exceptions.NotImplemented as exc:
except salt.exceptions.CommandExecutionError as exc:
log.error('Status beacon attempted to process function {0} \
but encountered error: {1}'.format(func, exc))
continue

View file

@ -27,7 +27,7 @@ import salt.utils.event
from salt.utils.network import host_to_ips as _host_to_ips
from salt.utils.network import remote_port_tcp as _remote_port_tcp
from salt.ext.six.moves import zip
from salt.exceptions import CommandExecutionError, NotImplemented
from salt.exceptions import CommandExecutionError
__virtualname__ = 'status'
__opts__ = {}