0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

use python logging

Browse source
This commit is contained in:
j 2014-05-17 16:26:59 +02:00
commit 6a8a7b956d
27 changed files with 174 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

15
oml/websocket.py
View file

@ -2,6 +2,8 @@
# vi:si:et:sw=4:sts=4:ts=4
from __future__ import division
import logging
from tornado.websocket import WebSocketHandler
from tornado.ioloop import IOLoop
from Queue import Queue
@ -12,6 +14,8 @@ from oxflask.shortcuts import json_dumps
import state
logger = logging.getLogger('oml.websocket')
class Background:
def __init__(self, handler):
@ -24,8 +28,6 @@ class Background:
while self.connected:
message = self.q.get()
action, data = json.loads(message)
print action
print data
import item.scan
if action == 'ping':
self.post(['pong', data])
@ -55,9 +57,8 @@ class Handler(WebSocketHandler):
background = None
def open(self):
print "New connection opened."
if self.request.host not in self.request.headers['origin']:
print 'reject cross site attempt to open websocket', self.request
logger.debug('reject cross site attempt to open websocket %s', self.request)
self.close()
self.background = Background(self)
state.websockets.append(self.background)
@ -70,19 +71,17 @@ class Handler(WebSocketHandler):
self.background.put(message)
def on_close(self):
print "Connection closed."
if self.background:
state.websockets.remove(self.background)
self.background.connected = False
def trigger_event(event, data):
if len(state.websockets):
print 'trigger event', event, data, len(state.websockets)
logger.debug('trigger event %s %s', event, data, len(state.websockets))
for ws in state.websockets:
try:
ws.post([event, data])
except:
import traceback
traceback.print_exc()
print 'failed to send to ws', ws, event, data
logger.debug('failed to send to ws %s %s %s', ws, event, data)