Merge pull request #177 from jounaidr/164-log-the-topic

164 log the topic

apel-ssm.spec

@@ -21,7 +21,7 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 %endif
 
-Requires:       stomppy < 5.0.0, python-ldap < 3.4.0, openssl
+Requires:       stomppy < 5.0.0, python-ldap < 3.4.0, python-setuptools, openssl
 Requires(pre):  shadow-utils
 
 %define ssmconf %_sysconfdir/apel

requirements.txt

@@ -1,11 +1,10 @@
 # Base requirements for ssm
 
+argo-ams-library
 stomp.py<5.0.0
 python-daemon<=2.3.0  # 2.3.1 dropped support for Python 2
 python-ldap<3.4.0  # python-ldap-3.4.0 dropped support for Python 2
+setuptools  # Required for pkg_resources (also happens to be a dependency of python-ldap)
+
 # Dependencies for optional dirq based sending
 dirq
-
-# Dependencies for experimental AMS functionality
-
-argo-ams-library

setup.py

@@ -51,7 +51,7 @@ def main():
           download_url='https://github.com/apel/ssm/releases',
           license='Apache License, Version 2.0',
           install_requires=[
-              'stomp.py<5.0.0', 'python-ldap<3.4.0',
+              'stomp.py<5.0.0', 'python-ldap<3.4.0', 'setuptools',
           ],
           extras_require={
               'AMS': ['argo-ams-library'],

ssm/ssm2.py

@@ -15,6 +15,8 @@
 """
 from __future__ import print_function
 
+import pkg_resources
+
 from ssm import crypto
 from ssm.message_directory import MessageDirectory
 
@@ -549,7 +551,16 @@ def handle_connect(self):
         connect to each in turn until successful.
         """
         if self._protocol == Ssm2.AMS_MESSAGING:
-            log.debug('handle_connect called for AMS, doing nothing.')
+            log.info("Using AMS version %s",
+                        pkg_resources.get_distribution('argo_ams_library').version)
+
+            log.info("Will connect to %s", self._brokers[0])
+
+            if self._dest is not None:
+                log.info('Will send messages to: %s', self._dest)
+
+            if self._listen is not None:
+                log.info('Will subscribe to: %s', self._listen)
             return
 
         log.info("Using stomp.py version %s.%s.%s.", *stomp.__version__)