Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
R
re6stnet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Milestones
Merge Requests
4
Merge Requests
4
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
re6stnet
Commits
b720af3b
Commit
b720af3b
authored
8 months ago
by
Tom Niget
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demo: handle errors in topology generation
parent
7b1034c8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
10 deletions
+16
-10
demo/demo
demo/demo
+16
-10
No files found.
demo/demo
View file @
b720af3b
...
...
@@ -500,11 +500,14 @@ if args.port:
if page
<
2:
body =
route_svg(page)
else:
body
=
registry.Popen(('python3',
'
-c
',
r
"""
if
1:
out
,
err
=
registry.Popen(('python3',
'
-c
',
r
"""
if
1:
import
math
,
json
from
re6st
.
registry
import
RegistryClient
g =
json.loads(RegistryClient(
'
http:
//
localhost
/').
topology
())
topo =
RegistryClient('http://localhost/').topology()
g =
json.loads(topo)
if
not
g:
print
('
digraph
{
"
empty
topology
"
[shape=
"none"
]
}')
exit
()
r =
set(g.pop('',
()))
a =
set()
for
v
in
g
.
values
()
:
...
...
@@ -523,13 +526,16 @@ if args.port:
for
v
in
v:
print
('"%
s
"
-
>
"%s";' % (n, title(v)))
print('}')
"""), stdout=subprocess.PIPE, cwd="..").communicate()[0].decode("utf-8")
if body:
body = subprocess.Popen(('neato', '-Tsvg'),
stdin=subprocess.PIPE, stdout=subprocess.PIPE,
).communicate(body.encode("utf-8"))[0].decode("utf-8")
if not body:
self.send_error(500)
"""), stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd="..").communicate()
if err:
self.send_error(500, explain=f'SVG generation failed: {err.decode()}')
return
graph_body = out.decode("utf-8")
try:
body = subprocess.run(('neato', '-Tsvg'), check=True, text=True,
input=graph_body).stdout
except subprocess.CalledProcessError as e:
self.send_error(500, explain=f"neato failed: {e.stderr}")
return
if ext == 'svg':
mt = 'image/svg+xml'
...
...
This diff is collapsed.
Click to expand it.
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