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

Fix Elasticsearch retuner

Browse Source 
The change db0135e297 did not allow the
returner function to continue when the data key was not present. This
made the Elasticsearch returner inoperable for most cases.

 Conflicts:
	salt/returners/elasticsearch_return.py
This commit is contained in:
Mike Place 2019-02-01 15:56:20 -07:00 committed by Gareth J. Greenaway
parent 1f6da6a2b7
commit 801abf2c57
No known key found for this signature in database
GPG Key ID: 10B62F8A7CAD7A41
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/returners/elasticsearch_return.py
View File

@ -225,8 +225,7 @@ def returner(ret):
'functions', job_id, job_fun
)
return
if ret.get('return', None) is None:
if ret.get('data', None) is None and ret.get('return') is None:
log.info(
'Won\'t push new data to Elasticsearch, job with jid=%s was '
'not successful', job_id