svn commit: r1398980 - in /qpid/proton/trunk/examples/messenger: client.py server.py

[rh...@apache.org]

Author: rhs
Date: Tue Oct 16 20:31:44 2012
New Revision: 1398980

URL: http://svn.apache.org/viewvc?rev=1398980&view=rev
Log:
fixed client/server example

Modified:
    qpid/proton/trunk/examples/messenger/client.py
    qpid/proton/trunk/examples/messenger/server.py

Modified: qpid/proton/trunk/examples/messenger/client.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/examples/messenger/client.py?rev=1398980&r1=1398979&r2=1398980&view=diff
==============================================================================
--- qpid/proton/trunk/examples/messenger/client.py (original)
+++ qpid/proton/trunk/examples/messenger/client.py Tue Oct 16 20:31:44 2012
@@ -23,8 +23,8 @@ from proton import *
 parser = optparse.OptionParser(usage="usage: %prog <addr> <subject>",
                                description="simple message server")
 
-parser.add_option("-r", "--reply_to", default="replies",
-                  help="address: //<domain>[/<name>] (default %default)")
+parser.add_option("-r", "--reply_to", default="~/replies",
+                  help="address: [amqp://]<domain>[/<name>] (default %default)")
 
 opts, args = parser.parse_args()
 
@@ -44,7 +44,7 @@ msg.reply_to = opts.reply_to
 mng.put(msg)
 mng.send()
 
-if opts.reply_to[:2] != "//":
+if opts.reply_to[:2] != "~/":
   mng.recv(1)
   try:
     mng.get(msg)

Modified: qpid/proton/trunk/examples/messenger/server.py
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/examples/messenger/server.py?rev=1398980&r1=1398979&r2=1398980&view=diff
==============================================================================
--- qpid/proton/trunk/examples/messenger/server.py (original)
+++ qpid/proton/trunk/examples/messenger/server.py Tue Oct 16 20:31:44 2012
@@ -26,7 +26,7 @@ parser = optparse.OptionParser(usage="us
 opts, args = parser.parse_args()
 
 if not args:
-  args = ["//~0.0.0.0"]
+  args = ["amqp://~0.0.0.0"]
 
 mng = Messenger()
 mng.start()
@@ -35,8 +35,10 @@ for a in args:
   mng.subscribe(a)
 
 def dispatch(request, response):
-  response.subject = "Re: %s" % request.subject
-  print "Dispatched %s" % request.subject
+  if request.subject:
+    response.subject = "Re: %s %s" % request.subject
+  response.properties = request.properties
+  print "Dispatched %s %s" % (request.subject, request.properties)
 
 msg = Message()
 reply = Message()
@@ -50,6 +52,7 @@ while True:
     if msg.reply_to:
       reply.address = msg.reply_to
       reply.correlation_id = msg.correlation_id
+      reply.load(msg.save())
     dispatch(msg, reply)
     mng.put(reply)
     mng.send()



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org