Merge pull request #130 from vkuznet/master

Switch to CMSMonitoring StompAMQ

Author: Daniel Abercrombie

setup.py

@@ -19,6 +19,7 @@
         },
     install_requires=[
         'cmstoolbox>=0.12.0',
+        'CMSMonitoring',
         'more-itertools<6.0.0',
         'cherrypy<18.0.0',
         'mako',

workflowmonit/sendToMonit.py

@@ -11,7 +11,7 @@
 from Queue import Queue
 
 import yaml
-from workflowmonit.stompAMQ import stompAMQ
+from CMSMonitoring.StompAMQ import StompAMQ
 import workflowmonit.workflowCollector as wc
 import workflowmonit.alertingDefs as ad
 
@@ -240,12 +240,12 @@ def sendDoc(cred, docs):
         return []
 
     try:
-        amq = stompAMQ(
-            None,  # username
-            None,  # password
-            cred['producer'],
-            cred['topic'],
-            # default [('agileinf-mb.cern.ch', 61213)]
+        amq = StompAMQ(
+            username = None,
+            password = None,
+            producer = cred['producer'],
+            topic = cred['topic'],
+            validation_schema = None,
             host_and_ports=[
                 (cred['hostport']['host'], cred['hostport']['port'])],
             logger=logger,