grextras: rename stats server to query

guruofquality · Mar 26, 2013 · a3b79c7 · a3b79c7
1 parent d791143
commit a3b79c7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
@@ -26,7 +26,7 @@ list(APPEND grc_sources
     extras_packet_framer.xml
     extras_packet_deframer.xml
 
-    extras_stats_server.xml
+    extras_query_server.xml
 )
 
 install(

diff --git a/grc/extras_block_tree.xml b/grc/extras_block_tree.xml
@@ -46,6 +46,6 @@
         <block>extras_tuntap</block>
         <block>extras_packet_framer</block>
         <block>extras_packet_deframer</block>
-        <block>extras_stats_server</block>
+        <block>extras_query_server</block>
     </cat>
 </cat>
diff --git a/grc/extras_stats_server.xml → grc/extras_query_server.xml b/grc/extras_stats_server.xml → grc/extras_query_server.xml
@@ -1,22 +1,28 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-##Simple HTTP Stats Server
+##Simple HTTP Query Server for TopBlock
 ###################################################
  -->
 <block>
-    <name>Ex: Stats Server</name>
-    <key>extras_stats_server</key>
-    <import>import gras.stats</import>
+    <name>Ex: Query Server</name>
+    <key>extras_query_server</key>
+    <import>import gras.query</import>
     <import>import threading</import>
-    <make>self.$(id) = gras.stats.http_server(($addr, $port), self)
+    <make>self.$(id) = gras.query.http_server(($addr, $port), top_block=self, name=$name)
 thread = threading.Thread(target=self.$(id).serve_forever)
 thread.daemon = True
 thread.start()</make>
+    <param>
+        <name>Name</name>
+        <key>name</key>
+        <value>top_block</value>
+        <type>string</type>
+    </param>
     <param>
         <name>Address</name>
         <key>addr</key>
-        <value>localhost</value>
+        <value>0.0.0.0</value>
         <type>string</type>
     </param>
     <param>
@@ -26,6 +32,6 @@ thread.start()</make>
         <type>int</type>
     </param>
     <doc>
-This block will start a simple HTTP server for querying the top block stats.
+This block will start a simple HTTP server for querying flow graph information.
     </doc>
 </block>