Add a StatsCollector to the Relay too.

setup.py

@@ -31,7 +31,7 @@ setup(
     entry_points={
         'console_scripts': [
             'eddn-gateway = eddn.Gateway:main',
-            'eddn-relay = eddn.Relay:run',
+            'eddn-relay = eddn.Relay:main',
             ],
         }
       )

src/eddn/Client.py

@@ -9,7 +9,7 @@ def main():
     subscriber = context.socket(zmq.SUB)
 
     subscriber.setsockopt(zmq.SUBSCRIBE, "")
-    subscriber.connect('tcp://eddn-relay.elite-markets.net:9500')
+    subscriber.connect('tcp://localhost:9500')
 
     while True:
         market_json = zlib.decompress(subscriber.recv())

src/eddn/Relay.py

@@ -4,16 +4,47 @@ they receive over PUB/SUB.
 """
 # Logging has to be configured first before we do anything.
 import logging
+from threading import Thread
 
 logger = logging.getLogger(__name__)
 import zlib
 
 import gevent
+import simplejson
 import zmq.green as zmq
+from bottle import get, run as bottle_run
 from eddn.conf import Settings
 
+from gevent import monkey
+monkey.patch_all()
 
-def run():
+from eddn.StatsCollector import StatsCollector
+
+statsCollector = StatsCollector()
+statsCollector.start()
+
+
+@get('/stats/')
+def stats():
+    return simplejson.dumps(
+        {
+            "inbound": {
+                "1min": statsCollector.getInboundCount(1),
+                "5min": statsCollector.getInboundCount(5),
+                "60min": statsCollector.getInboundCount(60)
+            },
+            "outbound": {
+                "1min": statsCollector.getOutboundCount(1),
+                "5min": statsCollector.getOutboundCount(5),
+                "60min": statsCollector.getOutboundCount(60)
+            },
+        }
+    )
+
+
+class Relay(Thread):
+
+    def run(self):
         """
         Fires up the relay process.
         """
@@ -45,14 +76,23 @@ def run():
                 message = zlib.decompress(message)
 
             sender.send(message)
+            statsCollector.tallyOutbound()
 
         logger.info("Relay is now listening for order data.")
 
         while True:
             # For each incoming message, spawn a greenlet using the relay_worker
             # function.
-        gevent.spawn(relay_worker, receiver.recv())
+            inboundMessage = receiver.recv()
+            statsCollector.tallyInbound()
+            gevent.spawn(relay_worker, inboundMessage)
+
+
+def main():
+    r = Relay()
+    r.start()
+    bottle_run(host='0.0.0.0', port=9090, server='gevent')
 
 
 if __name__ == '__main__':
-    run()
+    main()