diff --git a/zerver/lib/event_queue.py b/zerver/lib/event_queue.py index 6d2210da97..2f563fe050 100644 --- a/zerver/lib/event_queue.py +++ b/zerver/lib/event_queue.py @@ -91,10 +91,6 @@ class ClientDescriptor(object): async_request_restart(self.current_handler._request) self.event_queue.push(event) - logging.info("DEBUG: Added %s event to queue %s: handler is %s" % ( - event.get("type"), - self.event_queue.id, - self.current_handler is not None)) if self.current_handler is not None: try: self.current_handler._request._log_data['extra'] = "[%s/1]" % (self.event_queue.id,) @@ -103,10 +99,8 @@ class ClientDescriptor(object): queue_id=self.event_queue.id), self.current_handler._request, apply_markdown=self.apply_markdown) - logging.info("DEBUG: Successfully called back on queue %s" % (self.event_queue.id)) except socket.error: - logging.info("DEBUG: Got error adding event to queue %s" % (self.event_queue.id)) - traceback.print_exc() + logging.exception("Got error adding event to queue %s" % (self.event_queue.id)) self.disconnect_handler() def accepts_event_type(self, type): @@ -132,11 +126,8 @@ class ClientDescriptor(object): heartbeat_time = time.time() + HEARTBEAT_MIN_FREQ_SECS + random.randint(0, 10) if self.client_type.name != 'API: heartbeat test': self._timeout_handle = ioloop.add_timeout(heartbeat_time, timeout_callback) - logging.info("DEBUG: connected handler for queue %s" % (self.event_queue.id,)) def disconnect_handler(self): - if self.current_handler is not None: - logging.info("DEBUG: disconnected handler for queue %s" % (self.event_queue.id,)) self.current_handler = None if self._timeout_handle is not None: ioloop = tornado.ioloop.IOLoop.instance() diff --git a/zerver/tornadoviews.py b/zerver/tornadoviews.py index dbce608ffa..c463b3df06 100644 --- a/zerver/tornadoviews.py +++ b/zerver/tornadoviews.py @@ -61,7 +61,6 @@ def get_events_backend(request, user_profile, handler = None, queue_id = client.event_queue.id else: return json_error("Missing 'queue_id' argument") - logging.info("DEBUG: created queue %s" % (queue_id,)) else: if last_event_id is None: return json_error("Missing 'last_event_id' argument")