Commit 417f6bbe authored by James Coyle's avatar James Coyle

Merge branch 'james-dev' into 'master'

Further work on client version

See merge request james.coyle/storjalytics-client!5
parents faa7bd7c ba7fc329
Pipeline #1096 passed with stages
in 3 seconds
from storjstatus import storjstatus_send
from storjstatus import storjstatus_register
from storjstatus import storjstatus_common
from version import __version__
from storjstatus import version
def send():
storjstatus_send.init_send()
......
import os
import re
import subprocess
from storjstatus import version
CONFIGFILE = '/etc/storjstatus/config.json'
......@@ -15,6 +16,10 @@ def setup_env():
ENV['PATH'] = ENV.get('PATH') + ':/usr/local/bin:/usr/bin/'
def get_version():
return __version__
def cleanup_json(json):
json = re.sub(r'(?<!https:)//.*', '', json, flags = re.MULTILINE)
json = json.strip().replace('\r', '').replace('\n', '')
......
......@@ -67,7 +67,7 @@ def init_send():
json_request = {
'serverId': SERVERGUID,
'datetime': time.time(),
'storjstatusVerion': storjstatus_common.VERSION,
'storjclientVerion': storjstatus_common.get_version(),
'storjshareVersion': storjshare_version(),
'nodes': json_nodes
}
......
__version__ = '0.2.1'
__version__ = '0.2.2'
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