diff options
| -rw-r--r-- | lib/top_block_query.cpp | 6 | ||||
| -rw-r--r-- | query/__init__.py | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/top_block_query.cpp b/lib/top_block_query.cpp index 5f22e21..1a5a408 100644 --- a/lib/top_block_query.cpp +++ b/lib/top_block_query.cpp @@ -205,7 +205,7 @@ static std::string query_flows(ElementImpl *self, const ptree &query) std::string buff; buff += "digraph flat_flows {\n"; buff += "rankdir=LR;\n"; - buff += "node [shape=record];\n"; + buff += "node [shape=record, fontsize=10];\n"; BOOST_FOREACH(Apology::Worker *w, self->executor->get_workers()) { @@ -223,8 +223,8 @@ static std::string query_flows(ElementImpl *self, const ptree &query) out_ports_str += str(boost::format("<out%u> %u") % i % i); } if (out_ports_str.size()) out_ports_str = " | {" + out_ports_str + "}"; - buff += str(boost::format("%s [shape=record,label=\"{ %s %s %s }\"];\n") - % actor->GetAddress().AsString() % in_ports_str % actor->data->block->get_uid() % out_ports_str + buff += str(boost::format("%s [shape=record, label=\"{ %s %s %s }\", style=filled];\n") + % actor->GetAddress().AsString() % in_ports_str % actor->data->block->to_string() % out_ports_str ); } diff --git a/query/__init__.py b/query/__init__.py index 28c11a4..40c645b 100644 --- a/query/__init__.py +++ b/query/__init__.py @@ -32,9 +32,9 @@ class MyHandler(BaseHTTPServer.BaseHTTPRequestHandler): s.end_headers() dot = args['top_block'].query(json.dumps(dict(path='/flows.dot'))) import subprocess - open("/tmp/dot.dot", 'w').write(dot) - subprocess.check_call(["dot", "-T", "png", "-o", "/tmp/dot.png", "/tmp/dot.dot"]) - s.wfile.write(open("/tmp/dot.png").read()) + p = subprocess.Popen(args=["dot", "-T", "png"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + (stdout, stderr) = p.communicate(input=dot) + s.wfile.write(stdout) return #handle json requests |