dash/enteletaor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Minor fixes

Browse Source
This commit is contained in:
cr0hn
2016-03-04 23:33:25 +01:00
parent c7134e109f
commit ddc6a3c34f
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
enteletaor_lib/modules/redis/redis_disconnect.py
View File

@@ -22,9 +22,13 @@ def action_redis_server_disconnect(config):
# Disconnect all clients? # Disconnect all clients?
if config.disconnect_all: if config.disconnect_all:
for c in clients: for c in clients:
con.client_kill(c) try:
con.client_kill(c)
log.error(" - Client '%s' was disconnected" % c)
except redis.exceptions.ResponseError:
log.error(" - Client '%s' is not connected" % c)
log.error(" - Client '%s' was disconnected" % c)
# Disconnect only one user # Disconnect only one user
else: else:
@@ -35,9 +39,12 @@ def action_redis_server_disconnect(config):
try: try:
_c = clients[config.client] _c = clients[config.client]
try:
con.client_kill(_c)
con.client_kill(_c) log.error(" - Client '%s' was disconnected" % _c)
except redis.exceptions.ResponseError:
log.error(" - Client '%s' is not connected" % _c)
log.error(" - Client '%s' was disconnected" % _c)
except KeyError: except KeyError:
log.error(" <!> Client '%s' doesn't appear to be connected to server" % config.client) log.error(" <!> Client '%s' doesn't appear to be connected to server" % config.client)

5
enteletaor_lib/modules/tasks/tasks_list_process.py
View File

@@ -65,7 +65,10 @@ def action_proc_list_tasks(config):
# Save template # Save template
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Build path in current dir # Build path in current dir
export_path = "%s.json" % os.path.abspath(config.template) export_path = os.path.abspath(config.template)
if ".json" not in export_path:
export_path += ".json"
# dumps # dumps
json.dump(export_data, open(export_path, "w")) json.dump(export_data, open(export_path, "w"))