xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1

Browse source 
Former-commit-id: fcc9115b0d [formerly 552490206f [formerly eaa41b4f2dd9fce2d957a2311ee3f4f04f220365]]
Former-commit-id: 552490206f
Former-commit-id: fa16721854
This commit is contained in:
Brian.Dyke 2014-03-11 10:44:03 -04:00
commit 1cb3691cc4
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
edexOsgi/com.raytheon.uf.tools.cli/impl/src/qpidNotify/mhsAckNotify.py
View file

@ -8,6 +8,7 @@
# 04/06/2012 10388 D. Friedman Initial version
# 10/09/12 DR 13901 D. Friedman Limit execution time
# 06/13/2013 DR 16242 D. Friedman Add Qpid authentication info
# 03/06/2014 DR 17907 D. Friedman Workaround for issue QPID-5569
##############################################################################
import getopt
@ -53,7 +54,8 @@ def send_message(connection, notif):
props = session.delivery_properties(routing_key=TOPIC_NAME)
head = session.message_properties(application_headers={'sender':notif.sender,
'response':notif.response})
'response':notif.response},
user_id=QPID_USERNAME) # For issue QPID-5569. Fixed in Qpid 0.27
session.message_transfer(destination=DESTINATION, message=Message(props, head, notif.messageId))
session.close(timeout=10)
connection.close()

4
pythonPackages/ufpy/qpidingest.py
View file

@ -58,6 +58,7 @@
# ------------ ---------- ----------- --------------------------
# ....
# 06/13/2013 DR 16242 D. Friedman Add Qpid authentication info
# 03/06/2014 DR 17907 D. Friedman Workaround for issue QPID-5569
#
#===============================================================================
@ -97,7 +98,8 @@ class IngestViaQPID:
@param header: string header used to determine plugin decoder to use
'''
props = self.session.delivery_properties(routing_key='external.dropbox')
head = self.session.message_properties(application_headers={'header':header})
head = self.session.message_properties(application_headers={'header':header},
user_id=QPID_USERNAME) # For issue QPID-5569. Fixed in Qpid 0.27
self.session.message_transfer(destination='amq.direct', message=Message(props, head, filepath))
def close(self):