Commit c778c917 authored by James Coyle's avatar James Coyle

Merge branch 'james-dev' into 'master'

Servers with no nodes now report in with success.

See merge request !11
parents 8877b0e4 42b93944
Pipeline #1156 passed with stages
in 4 seconds
......@@ -126,7 +126,10 @@ def bridge_info(id):
def storjshare_json():
result_data = storjstatus_common.subprocess_result(['storjshare', 'status', '--json'])
return json.loads(result_data[0].decode('utf-8')) #result_json
if result_data[0].decode('utf-8') != '':
return json.loads(result_data[0].decode('utf-8')) #result_json
else:
return []
def config_json():
......@@ -166,8 +169,6 @@ def config_json():
exit(1)
def load_settings():
global APIKEY
global APISECRET
......
__version__ = '0.2.6'
__version__ = '0.2.7'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment