"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "salt/metaproxy/proxy.py" between
salt-3002.1.tar.gz and salt-3002.2.tar.gz

About: SaltStack is a systems management software for data center automation, cloud orchestration, server provisioning, configuration management and more. Community version.

proxy.py  (salt-3002.1):proxy.py  (salt-3002.2)
skipping to change at line 551 skipping to change at line 551
except TypeError as exc: except TypeError as exc:
msg = "Passed invalid arguments to {}: {}\n{}".format( msg = "Passed invalid arguments to {}: {}\n{}".format(
function_name, exc, func.__doc__ or "" function_name, exc, func.__doc__ or ""
) )
log.warning(msg, exc_info_on_loglevel=logging.DEBUG) log.warning(msg, exc_info_on_loglevel=logging.DEBUG)
ret["return"] = msg ret["return"] = msg
ret["out"] = "nested" ret["out"] = "nested"
ret["retcode"] = salt.defaults.exitcodes.EX_GENERIC ret["retcode"] = salt.defaults.exitcodes.EX_GENERIC
except Exception: # pylint: disable=broad-except except Exception: # pylint: disable=broad-except
msg = "The minion function caused an exception" msg = "The minion function caused an exception"
log.warning(msg, exc_info_on_loglevel=True) log.warning(msg, exc_info=True)
salt.utils.error.fire_exception( salt.utils.error.fire_exception(
salt.exceptions.MinionError(msg), opts, job=data salt.exceptions.MinionError(msg), opts, job=data
) )
ret["return"] = "{}: {}".format(msg, traceback.format_exc()) ret["return"] = "{}: {}".format(msg, traceback.format_exc())
ret["out"] = "nested" ret["out"] = "nested"
ret["retcode"] = salt.defaults.exitcodes.EX_GENERIC ret["retcode"] = salt.defaults.exitcodes.EX_GENERIC
else: else:
docs = minion_instance.functions["sys.doc"]("{}*".format(function_name)) docs = minion_instance.functions["sys.doc"]("{}*".format(function_name))
if docs: if docs:
docs[function_name] = minion_instance.functions.missing_fun_string( docs[function_name] = minion_instance.functions.missing_fun_string(
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)