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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
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
Gabriel Monnerat
slapos.core
Commits
666089eb
Commit
666089eb
authored
Jul 05, 2012
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup of slapgrid
parent
08cf13d7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
13 deletions
+5
-13
slapos/grid/networkcache.py
slapos/grid/networkcache.py
+0
-7
slapos/grid/slapgrid.py
slapos/grid/slapgrid.py
+5
-6
No files found.
slapos/grid/networkcache.py
View file @
666089eb
...
...
@@ -12,15 +12,8 @@
#
##############################################################################
import
hashlib
import
os
import
posixpath
import
re
import
shutil
import
urlparse
import
traceback
import
utils
import
json
import
platform
...
...
slapos/grid/slapgrid.py
View file @
666089eb
...
...
@@ -48,7 +48,6 @@ from utils import setRunning
from
utils
import
setFinished
from
utils
import
getSoftwareUrlHash
from
slapos
import
slap
from
slapos.slap
import
NotFoundError
from
slapos.slap.slap
import
ServerError
from
utils
import
dropPrivileges
from
utils
import
SlapPopen
...
...
@@ -57,7 +56,6 @@ import tempfile
from
time
import
strftime
import
StringIO
from
lxml
import
etree
from
time
import
sleep
from
random
import
random
from
slapos.slap.slap
import
NotFoundError
...
...
@@ -721,12 +719,13 @@ class Slapgrid(object):
usage_string
=
StringIO
.
StringIO
(
computer_partition_usage
.
usage
)
root
=
etree
.
parse
(
usage_string
)
except
UnicodeError
:
logger
.
info
(
"Failed to read %s."
%
(
computer_partition_usage
.
usage
))
logger
.
error
(
UnicodeError
)
self
.
logger
.
info
(
"Failed to read %s."
%
(
computer_partition_usage
.
usage
))
self
.
logger
.
error
(
UnicodeError
)
raise
"Failed to read %s."
%
(
computer_partition_usage
.
usage
)
except
(
etree
.
XMLSyntaxError
,
etree
.
DocumentInvalid
)
as
e
:
logger
.
info
(
"Failed to parse %s."
%
(
usage_string
))
logger
.
error
(
e
)
self
.
logger
.
info
(
"Failed to parse %s."
%
(
usage_string
))
self
.
logger
.
error
(
e
)
raise
_formatXMLError
(
e
)
except
Exception
:
raise
"Failed to generate XML report."
...
...
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