diff --git a/sylk/applications/webrtcgateway/__init__.py b/sylk/applications/webrtcgateway/__init__.py index 2e00b69..302c6dd 100644 --- a/sylk/applications/webrtcgateway/__init__.py +++ b/sylk/applications/webrtcgateway/__init__.py @@ -1,36 +1,35 @@ from sylk.applications import SylkApplication from sylk.applications.webrtcgateway.logger import log from sylk.applications.webrtcgateway.storage import TokenStorage -from sylk.applications.webrtcgateway.util import IdentityFormatter from sylk.applications.webrtcgateway.web import WebHandler, AdminWebHandler class WebRTCGatewayApplication(SylkApplication): def __init__(self): self.web_handler = WebHandler() self.admin_web_handler = AdminWebHandler() def start(self): self.web_handler.start() self.admin_web_handler.start() # Load tokens from the storage token_storage = TokenStorage() token_storage.load() def stop(self): self.web_handler.stop() self.admin_web_handler.stop() def incoming_session(self, session): - log.info(u'New incoming session %s from %s rejected' % (session.call_id, IdentityFormatter.format(session.remote_identity))) + log.info('New incoming session {session.call_id} from sip:{uri.user}@{uri.host} rejected'.format(session=session, uri=session.remote_identity.uri)) session.reject(403) def incoming_subscription(self, request, data): request.reject(405) def incoming_referral(self, request, data): request.reject(405) def incoming_message(self, request, data): request.reject(405) diff --git a/sylk/applications/webrtcgateway/util.py b/sylk/applications/webrtcgateway/util.py index 3ece6f0..8edfa5c 100644 --- a/sylk/applications/webrtcgateway/util.py +++ b/sylk/applications/webrtcgateway/util.py @@ -1,32 +1,23 @@ from eventlib.coros import event -class IdentityFormatter(object): - @classmethod - def format(cls, identity): - if identity.display_name: - return u'%s ' % (identity.display_name, identity.uri.user, identity.uri.host) - else: - return u'sip:%s@%s' % (identity.uri.user, identity.uri.host) - - class GreenEvent(object): def __init__(self): self._event = event() def set(self): if self._event.ready(): return self._event.send(True) def is_set(self): return self._event.ready() def clear(self): if self._event.ready(): self._event.reset() def wait(self): return self._event.wait()