Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change _log -> _logger. #19

Merged
merged 1 commit into from
Jul 17, 2015
Merged

Change _log -> _logger. #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions terminado/websocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def initialize(self, term_manager):
self.size = (None, None)
self.terminal = None

self._log = logging.getLogger(__name__)
self._logger = logging.getLogger(__name__)

def origin_check(self):
"""Reject connections from other origin pages.
Expand All @@ -76,7 +76,7 @@ def origin_check(self):
if host == ws_host:
return True
else:
self._log.error("pyxterm.origin_check: ERROR %s != %s", host, ws_host)
self._logger.error("pyxterm.origin_check: ERROR %s != %s", host, ws_host)
return False

def open(self, url_component=None):
Expand All @@ -88,7 +88,7 @@ def open(self, url_component=None):
if not self.origin_check():
raise tornado.web.HTTPError(404, "Websocket origin mismatch")

self._log.info("TermSocket.open: %s", url_component)
self._logger.info("TermSocket.open: %s", url_component)

url_component = _cast_unicode(url_component)
self.term_name = url_component or 'tty'
Expand All @@ -98,7 +98,7 @@ def open(self, url_component=None):
self.terminal.clients.append(self)

self.send_json_message(["setup", {}])
self._log.info("TermSocket.open: Opened %s", self.term_name)
self._logger.info("TermSocket.open: Opened %s", self.term_name)

def on_pty_read(self, text):
"""Data read from pty; send to frontend"""
Expand Down Expand Up @@ -130,7 +130,7 @@ def on_close(self):
Disconnect from our terminal, and tell the terminal manager we're
disconnecting.
"""
self._log.info("Websocket closed")
self._logger.info("Websocket closed")
if self.terminal:
self.terminal.clients.remove(self)
self.terminal.resize_to_smallest()
Expand Down