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
486646a5
Commit
486646a5
authored
Mar 06, 2018
by
James Coyle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed logger/ logging name
parent
178fe013
Pipeline
#1107
failed with stages
in 2 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
storjstatus/storjstatus_send.py
storjstatus/storjstatus_send.py
+6
-6
No files found.
storjstatus/storjstatus_send.py
View file @
486646a5
...
...
@@ -65,7 +65,7 @@ def init_send():
}
json_nodes
.
append
(
json_node
)
else
:
logg
er
.
warning
(
"No config file found for Node: %s. Data for this node will not be sent."
,
node
[
'id'
])
logg
ing
.
warning
(
"No config file found for Node: %s. Data for this node will not be sent."
,
node
[
'id'
])
json_request
=
{
'serverId'
:
SERVERGUID
,
...
...
@@ -137,7 +137,7 @@ def config_json():
for
f
in
filenames
:
# consume config file
with
open
(
os
.
path
.
join
(
root
,
f
),
'r'
,
encoding
=
"ISO-8859-1"
)
as
f_open
:
logg
er
.
info
(
"Parsing config file: "
+
os
.
path
.
join
(
root
,
f
))
logg
ing
.
debug
(
"Parsing config file: "
+
os
.
path
.
join
(
root
,
f
))
node
=
{}
f_data
=
f_open
.
read
()
f_clean
=
storjstatus_common
.
cleanup_json
(
f_data
)
...
...
@@ -151,13 +151,13 @@ def config_json():
node
[
'storageAllocation'
]
=
f_json
[
'storageAllocation'
]
nodes
[
f_json
[
'storagePath'
]]
=
node
logg
er
.
info
(
"Found valid config for "
+
f_json
[
'storagePath'
])
logg
ing
.
info
(
"Found valid config for "
+
f_json
[
'storagePath'
])
except
KeyError
:
logg
er
.
warning
(
'JSON config file '
+
f
+
' invalid. Please check your config.'
)
logg
ing
.
warning
(
'JSON config file '
+
f
+
' invalid. Please check your config.'
)
except
json
.
JSONDecodeError
:
logg
er
.
warning
(
'JSON config file '
+
f
+
' invalid. Please check your config.'
)
logg
ing
.
warning
(
'JSON config file '
+
f
+
' invalid. Please check your config.'
)
except
:
logg
er
.
warning
(
"File "
+
f
+
" is not a valid Storjshare JSON config file"
)
logg
ing
.
warning
(
"File "
+
f
+
" is not a valid Storjshare JSON config file"
)
if
nodes
:
return
nodes
...
...
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