Skip to content

Commit

Permalink
Don't display the daemon response data on some nodemgr actions output
Browse files Browse the repository at this point in the history
* nodemgr daemon blacklist clear
* nodemgr daemon shutdown
  • Loading branch information
cvaroqui committed Sep 28, 2018
1 parent b5a09bb commit 75f952f
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions lib/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -3969,7 +3969,11 @@ def daemon_blacklist_clear(self):
{"action": "daemon_blacklist_clear"},
nodename=self.options.node,
)
print(json.dumps(data, indent=4, sort_keys=True))
if data is None:
return 1
for error in data.get("errors", []):
print(error, file=sys.stderr)
return data.get("status")

def daemon_blacklist_status(self):
"""
Expand Down Expand Up @@ -4050,8 +4054,10 @@ def daemon_shutdown(self):
nodename=self.options.node,
)
if data is None:
raise ex.excError
print(json.dumps(data, indent=4, sort_keys=True))
return 1
for error in data.get("errors", []):
print(error, file=sys.stderr)
return data.get("status")

def _daemon_stop(self):
"""
Expand Down

0 comments on commit 75f952f

Please sign in to comment.