Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
18
Merge Requests
18
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos.core
Commits
87eb0e0e
Commit
87eb0e0e
authored
Jul 28, 2022
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapgrid: fix agregateAndSendUsage in python3
parent
0c25cfac
Pipeline
#22838
passed with stage
in 0 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+2
-2
No files found.
slapos/grid/slapgrid.py
View file @
87eb0e0e
...
@@ -1718,7 +1718,7 @@ stderr_logfile_backups=1
...
@@ -1718,7 +1718,7 @@ stderr_logfile_backups=1
file_path
=
os
.
path
.
join
(
dir_reports
,
filename
)
file_path
=
os
.
path
.
join
(
dir_reports
,
filename
)
if
os
.
path
.
exists
(
file_path
):
if
os
.
path
.
exists
(
file_path
):
with
open
(
file_path
,
'r'
)
as
f
:
with
open
(
file_path
,
'r
b
'
)
as
f
:
usage
=
f
.
read
()
usage
=
f
.
read
()
# We check the validity of xml content of each reports
# We check the validity of xml content of each reports
...
@@ -1765,7 +1765,7 @@ stderr_logfile_backups=1
...
@@ -1765,7 +1765,7 @@ stderr_logfile_backups=1
file_path
=
os
.
path
.
join
(
computer_report_dir
,
filename
)
file_path
=
os
.
path
.
join
(
computer_report_dir
,
filename
)
if
os
.
path
.
exists
(
file_path
):
if
os
.
path
.
exists
(
file_path
):
with
open
(
file_path
,
'r'
)
as
f
:
with
open
(
file_path
,
'r
b
'
)
as
f
:
usage
=
f
.
read
()
usage
=
f
.
read
()
if
self
.
validateXML
(
usage
,
computer_consumption_model
):
if
self
.
validateXML
(
usage
,
computer_consumption_model
):
...
...
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