laneya

commit

8f00eb7b2b6fc1379571317625d81aeb50ed22b4

parent

71b6dd626e0436e4bb22243ce6c28881549f1220

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2014-10-18 08:34

switch logger

Diffstat

3 files changed, 9 insertions, 8 deletions

diff --git a/laneya/client.py b/laneya/client.py

@@ -1,4 +1,3 @@
    1    -1 # from twisted.python import log
    2     1 from twisted.internet.endpoints import TCP4ClientEndpoint
    3     2 from twisted.internet import reactor
    4     3 from twisted.internet import task

diff --git a/laneya/protocol.py b/laneya/protocol.py

@@ -63,14 +63,17 @@ Update
   63    63 
   64    64 
   65    65 import json
   -1    66 import logging
   66    67 
   67    -1 from twisted.python import log
   68    68 from twisted.internet.protocol import Factory
   69    69 from twisted.internet import reactor
   70    70 
   71    71 import deferred as q
   72    72 import actions
   73    73 
   -1    74 logger = logging.getLogger('laneya')
   -1    75 logger.addHandler(logging.StreamHandler())
   -1    76 logging.getLogger('trollius').addHandler(logging.StreamHandler())
   74    77 
   75    78 key = 0
   76    79 
@@ -172,7 +175,7 @@ class BaseProtocol(JSONProtocol):
  172   175 
  173   176     def validate_message(self, message, expected_keys):
  174   177         if sorted(message.keys()) != expected_keys:
  175    -1             log.err('Invalid message: %s' % message)
   -1   178             logger.error('Invalid message: %s' % message)
  176   179             raise InvalidError
  177   180 
  178   181     def validate_action(self, action, data):
@@ -180,7 +183,7 @@ class BaseProtocol(JSONProtocol):
  180   183             fn = getattr(actions, action)
  181   184             fn(**data)
  182   185         except:
  183    -1             log.err('Invalid action: %s %s' % (action, data))
   -1   186             logger.error('Invalid action: %s %s' % (action, data))
  184   187             raise InvalidError
  185   188 
  186   189 
@@ -206,7 +209,7 @@ class ServerProtocol(BaseProtocol):
  206   209         except IllegalError as err:
  207   210             return self._send_response(key, 'illegal', message=str(err))
  208   211         except Exception as err:
  209    -1             log.err(err)
   -1   212             logger.error(err)
  210   213             return self._send_response(key, 'internal', message=str(err))
  211   214 
  212   215         if response is None:
@@ -225,7 +228,7 @@ class ServerProtocol(BaseProtocol):
  225   228                 message['action'],
  226   229                 **message['data'])
  227   230         else:
  228    -1             log.err('Message type not known: %s' % message['type'])
   -1   231             logger.error('Message type not known: %s' % message['type'])
  229   232 
  230   233     def _send_response(self, key, status, **kwargs):
  231   234         data = {
@@ -302,7 +305,7 @@ class ClientProtocol(BaseProtocol):
  302   305             self.update_received(message['action'], **message['data'])
  303   306 
  304   307         else:
  305    -1             log.err('Message type not known: %s' % message['type'])
   -1   308             logger.error('Message type not known: %s' % message['type'])
  306   309 
  307   310     def update_received(self, action, **kwargs):
  308   311         self.factory.update_received(action, **kwargs)

diff --git a/laneya/server.py b/laneya/server.py

@@ -1,6 +1,5 @@
    1     1 import sys
    2     2 
    3    -1 from twisted.python import log
    4     3 from twisted.internet.endpoints import TCP4ServerEndpoint
    5     4 from twisted.internet import reactor
    6     5 from twisted.internet import task