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 #51527 from garethgreenaway/bp-51475

Browse source 
Back-port PR #51475 to 2018.3
This commit is contained in:
Gareth J. Greenaway 2019-02-06 13:10:44 -07:00 • committed by GitHub
commit 5e840a54ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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