Making 'mode' option work for zmqtransport. Adding setuptools and tests (use ./setup.py nosetests). Adding .gitignore

Author: Josh Braegger

.gitignore

@@ -0,0 +1,6 @@
+*.pyc
+*.egg
+*.egg-info
+*.swp
+build
+dist

beaver/tests/__init__.py

@@ -0,0 +1,35 @@
+
+import unittest
+import os
+
+try:
+    from beaver.zmq_transport import ZmqTransport
+    skip = False
+except ImportError, e:
+    if e.message == "No module named zmq":
+        skip = True
+
+
+class Args():
+    mode = ""
+
+
+@unittest.skipIf(skip, "zmq not installed")
+class ZmqTests(unittest.TestCase):
+
+    def setUp(self):
+        self.args = Args()
+        self.args.mode = ""
+
+    def test_pub(self):
+        os.environ["ZEROMQ_ADDRESS"] = "tcp://localhost:2120"
+        transport = ZmqTransport("/dev/null", self.args)
+        transport.interrupt()
+        assert not transport.zeromq_bind
+
+    def test_bind(self):
+        self.args.mode = "bind"
+        os.environ["ZEROMQ_ADDRESS"] = "tcp://*:2120"
+        transport = ZmqTransport("/dev/null", self.args)
+        assert transport.zeromq_bind
+

beaver/tests/test_zmq_transport.py

@@ -217,7 +217,7 @@ def run_worker(configfile, args):
         transport = beaver.udp_transport.UdpTransport(configfile)
     elif args.transport == 'zmq':
         import beaver.zmq_transport
-        transport = beaver.zmq_transport.ZmqTransport(configfile)
+        transport = beaver.zmq_transport.ZmqTransport(configfile, args)
     else:
         raise Exception('Invalid transport {0}'.format(args.transport))
 

beaver/worker.py

@@ -7,16 +7,16 @@
 
 class ZmqTransport(beaver.transport.Transport):
 
-    def __init__(self, configfile):
+    def __init__(self, configfile, args):
         super(ZmqTransport, self).__init__(configfile)
 
         zeromq_address = os.environ.get("ZEROMQ_ADDRESS", "tcp://localhost:2120")
-        zeromq_bind = os.environ.get("BIND", False)
+        self.zeromq_bind = (args.mode == "bind")
 
         self.ctx = zmq.Context()
         self.pub = self.ctx.socket(zmq.PUSH)
 
-        if zeromq_bind:
+        if self.zeromq_bind:
             self.pub.bind(zeromq_address)
         else:
             self.pub.connect(zeromq_address)

beaver/zmq_transport.py

@@ -57,8 +57,10 @@ files = os.environ.get("BEAVER_FILES", None)
 if files is not None:
     files = files.split(',')
 
+bound = "bind" if os.environ.get("BIND", False) else None
+
 parser.set_defaults(
-    mode=os.environ.get("BEAVER_MODE", 'bind'),
+    mode=os.environ.get("BEAVER_MODE", "bind" if os.environ.get("BIND", False) else "connect"),
     path=os.environ.get("BEAVER_PATH", '/var/log'),
     files=files,
     transport=os.environ.get("BEAVER_TRANSPORT", 'stdout'),

bin/beaver

@@ -1,11 +1,16 @@
-from distutils.core import setup
+#!/usr/bin/env python
+
+try:
+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
 
 setup(
     name='Beaver',
     version='9',
     author='Jose Diaz-Gonzalez',
     author_email='[email protected]',
-    packages=['beaver'],
+    packages=['beaver', 'beaver.tests'],
     scripts=['bin/beaver'],
     url='http://github.com/josegonzalez/beaver',
     license='LICENSE.txt',
@@ -19,6 +24,8 @@
     ],
     description='python daemon that munches on logs and sends their contents to logstash',
     long_description=open('README.rst').read(),
+    tests_require=["nose",],
+    test_suite="nose.collector",
     install_requires=[
         "argparse>=1.2.0",
         "pika>=0.9.5",