Call check_supervisor() before connecting to Supervisor (fixes #10)

borntyping · borntyping · commit 66efde85b28f · 2014-08-18T12:17:48.000+01:00
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name = "supermann",
-    version = '2.1.2',
+    version = '2.1.3',
 
     author = "Sam Clements",
     author_email = "sam.clements@datasift.com",
diff --git a/supermann/__init__.py b/supermann/__init__.py
@@ -4,6 +4,6 @@
 
 from supermann.core import Supermann
 
-__version__ = '2.1.1'
+__version__ = '2.1.3'
 __author__ = 'Sam Clements <sam.clements@datasift.com>'
 __all__ = ['Supermann']
diff --git a/supermann/command.py b/supermann/command.py
@@ -79,10 +79,5 @@ def main():
         memmon = supermann.memmon.MemoryMonitor.from_args(*args.memmon)
         self.connect(supermann.signals.process, memmon.process)
 
-    # These methods check that Supermann is running as a child of the
-    # Supervisor process, and ensures basic information is logged
-    self.check_supervisor()
-    self.check_riemann()
-
     # Supermann will attempt to run forever
     self.run()
diff --git a/supermann/core.py b/supermann/core.py
@@ -27,8 +27,10 @@ def __init__(self, host=None, port=None):
 
         # The Supervisor listener and client take their configuration from
         # the environment variables provided by Supervisor
+        self.check_supervisor()
         self.supervisor = supermann.supervisor.Supervisor()
 
+        self.check_riemann(host, port)
         self.riemann = riemann_client.client.QueuedClient(
             riemann_client.transport.TCPTransport(host, port))
 
@@ -121,8 +123,7 @@ def check_supervisor(self):
 
         return True
 
-    def check_riemann(self):
+    def check_riemann(self, host, port):
         """Adds some basic information about the Riemann server to the log"""
         log = supermann.utils.getLogger(self.riemann)
-        log.info("Using Riemann protobuf server at {0}:{1}".format(
-            *self.riemann.transport.address))
+        log.info("Using Riemann protobuf server at {0}:{1}".format(host, port))
