You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2014/12/12 13:21:18 UTC
qpid-proton git commit: Use logging instead of print statements
Repository: qpid-proton
Updated Branches:
refs/heads/master 34e64e324 -> cdc922b84
Use logging instead of print statements
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/cdc922b8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/cdc922b8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/cdc922b8
Branch: refs/heads/master
Commit: cdc922b84f9541192ad39c8b387085a79e7be30f
Parents: 34e64e3
Author: Gordon Sim <gs...@redhat.com>
Authored: Fri Dec 12 12:21:40 2014 +0000
Committer: Gordon Sim <gs...@redhat.com>
Committed: Fri Dec 12 12:21:40 2014 +0000
----------------------------------------------------------------------
proton-c/bindings/python/proton/handlers.py | 6 +++---
proton-c/bindings/python/proton/reactors.py | 20 ++++++++++----------
2 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cdc922b8/proton-c/bindings/python/proton/handlers.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/handlers.py b/proton-c/bindings/python/proton/handlers.py
index 71ab837..701cb9e 100644
--- a/proton-c/bindings/python/proton/handlers.py
+++ b/proton-c/bindings/python/proton/handlers.py
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-import heapq, os, Queue, re, socket, time, types
+import heapq, logging, os, Queue, re, socket, time, types
from proton import dispatch, generate_uuid, PN_ACCEPTED, SASL, symbol, ulong, Url
from proton import Collector, Connection, Delivery, Described, Endpoint, Event, Link, Terminus, Timeout
from proton import Message, Handler, ProtonException, Transport, TransportException, ConnectionException
@@ -238,9 +238,9 @@ class EndpointStateHandler(Handler):
def print_error(self, endpoint, endpoint_type):
if endpoint.remote_condition:
- print endpoint.remote_condition.description
+ logging.error(endpoint.remote_condition.description)
elif self.is_local_open(endpoint) and self.is_remote_closed(endpoint):
- print "%s closed by peer" % endpoint_type
+ logging.error("%s closed by peer" % endpoint_type)
def on_link_remote_close(self, event):
if event.link.remote_condition:
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/cdc922b8/proton-c/bindings/python/proton/reactors.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/reactors.py b/proton-c/bindings/python/proton/reactors.py
index cab8c31..dcb7cae 100644
--- a/proton-c/bindings/python/proton/reactors.py
+++ b/proton-c/bindings/python/proton/reactors.py
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-import os, Queue, socket, time, types
+import logging, os, Queue, socket, time, types
from heapq import heappush, heappop, nsmallest
from proton import Collector, Connection, ConnectionException, Delivery, Described, dispatch
from proton import Endpoint, Event, EventBase, EventType, generate_uuid, Handler, Link, Message
@@ -122,10 +122,10 @@ class AmqpSocket(object):
else:
self.transport.close_tail()
except TransportException, e:
- print "Error on read: %s" % e
+ logging.error("Error on read: %s" % e)
self.read_done = True
except socket.error, e:
- print "Error on recv: %s" % e
+ logging.error("Error on recv: %s" % e)
self.read_done = True
self.write_done = True
elif c < 0:
@@ -141,10 +141,10 @@ class AmqpSocket(object):
elif p < 0:
self.write_done = True
except TransportException, e:
- print "Error on write: %s" % e
+ logging.error("Error on write: %s" % e)
self.write_done = True
except socket.error, e:
- print "Error on send: %s" % e
+ logging.error("Error on send: %s" % e)
self.write_done = True
def removed(self):
@@ -530,7 +530,7 @@ class Transaction(object):
elif event.delivery.remote_state == Delivery.REJECTED:
self.handler.on_transaction_declare_failed(event)
else:
- print "Unexpected outcome for declare: %s" % event.delivery.remote_state
+ logging.warning("Unexpected outcome for declare: %s" % event.delivery.remote_state)
self.handler.on_transaction_declare_failed(event)
elif event.delivery == self._discharge:
if event.delivery.remote_state == Delivery.REJECTED:
@@ -637,7 +637,7 @@ class Connector(Handler):
def _connect(self, connection):
host, port = connection.address.next()
- #print "connecting to %s:%i" % (host, port)
+ logging.info("connecting to %s:%i" % (host, port))
heartbeat = connection.heartbeat if hasattr(connection, 'heartbeat') else None
self.loop.add(AmqpSocket(connection, socket.socket(), self.loop.events, heartbeat=heartbeat).connect(host, port))
connection._pin = None #connection is now referenced by AmqpSocket, so no need for circular reference
@@ -655,13 +655,13 @@ class Connector(Handler):
event.connection._pin = event.connection #no longer referenced by AmqpSocket, so pin in memory with circular reference
delay = event.connection.reconnect.next()
if delay == 0:
- print "Disconnected, reconnecting..."
+ logging.info("Disconnected, reconnecting...")
self._connect(event.connection)
else:
- print "Disconnected will try to reconnect after %s seconds" % delay
+ logging.info("Disconnected will try to reconnect after %s seconds" % delay)
self.loop.schedule(time.time() + delay, connection=event.connection, subject=self)
else:
- print "Disconnected"
+ logging.info("Disconnected")
def on_timer(self, event):
if event.subject == self and event.connection:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org