Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
storjstatus-client
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
James Coyle
storjstatus-client
Commits
ba7fc329
Commit
ba7fc329
authored
Mar 06, 2018
by
James Coyle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Further work on client version
parent
b6e22ad4
Pipeline
#1094
passed with stages
in 4 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
storjstatus/__init__.py
storjstatus/__init__.py
+1
-1
storjstatus/storjstatus_common.py
storjstatus/storjstatus_common.py
+5
-0
storjstatus/storjstatus_send.py
storjstatus/storjstatus_send.py
+1
-1
storjstatus/version.py
storjstatus/version.py
+1
-1
No files found.
storjstatus/__init__.py
View file @
ba7fc329
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
()
...
...
storjstatus/storjstatus_common.py
View file @
ba7fc329
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
'
,
''
)
...
...
storjstatus/storjstatus_send.py
View file @
ba7fc329
...
...
@@ -67,7 +67,7 @@ def init_send():
json_request
=
{
'serverId'
:
SERVERGUID
,
'datetime'
:
time
.
time
(),
'storj
statusVerion'
:
storjstatus_common
.
VERSION
,
'storj
clientVerion'
:
storjstatus_common
.
get_version
()
,
'storjshareVersion'
:
storjshare_version
(),
'nodes'
:
json_nodes
}
...
...
storjstatus/version.py
View file @
ba7fc329
__version__
=
'0.2.
1
'
__version__
=
'0.2.
2
'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment