deavid / bjsonrpc Goto Github PK

(bjsonrpc)�]0;umeboshi@bard: ~/workspace/others/bjsonrpc�umeboshi@bard:~/workspace/others/bjsonrpc$ python setup.py install
running install
running build
running build_py
running install_lib
running install_egg_info
Removing /freespace/home/umeboshi/.virtualenvs/bjsonrpc/lib/python2.7/site-packages/bjsonrpc-0.2.1-py2.7.egg-info
Writing /freespace/home/umeboshi/.virtualenvs/bjsonrpc/lib/python2.7/site-packages/bjsonrpc-0.2.1-py2.7.egg-info
(bjsonrpc)�]0;umeboshi@bard: ~/workspace/others/bjsonrpc�umeboshi@bard:~/workspace/others/bjsonrpc$ python examples/example1-server.py &
[1] 18881
(bjsonrpc)�]0;umeboshi@bard: ~/workspace/others/bjsonrpc�umeboshi@bard:~/workspace/others/bjsonrpc$ ()
{'domain': 'yourdomain-dot-com'}
Hello world

(bjsonrpc)�]0;umeboshi@bard: ~/workspace/others/bjsonrpc�umeboshi@bard:~/workspace/others/bjsonrpc$ python
Python 2.7.3 (default, Jan  2 2013, 16:53:07) 
[GCC 4.7.2] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import bjsonrpc
>>> c = bjsonrpc.connect()
()
{'domain': 'yourdomain-dot-com'}
>>> c.call.echo('hi')
hi
u'hi'
>>> l = c.call.newList()
>>> l
<bjsonrpc.connection.RemoteObject object at 0x9d2914c>
>>> l.call.items()
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  File "bjsonrpc/proxies.py", line 45, in function
    return self._conn.proxy(self.sync_type, name, args, kwargs)
  File "bjsonrpc/connection.py", line 670, in proxy
    return req.value
  File "bjsonrpc/request.py", line 188, in value
    raise ServerError(err)
bjsonrpc.exceptions.ServerError: Unknown method 'mylist_0001.items'
>>> 
^C
(bjsonrpc)�]0;umeboshi@bard: ~/workspace/others/bjsonrpc�umeboshi@bard:~/workspace/others/bjsonrpc$ exit

diff -Naur --exclude '*.py?' --exclude '.*.swp' bjsonrpc-0.2.1-py2.7.old/bjsonrpc/connection.py bjsonrpc-0.2.1-py2.7.new/bjsonrpc/connection.py
--- bjsonrpc-0.2.1-py2.7.old/bjsonrpc/connection.py 2011-06-06 15:27:10.000000000 +0000
+++ bjsonrpc-0.2.1-py2.7.new/bjsonrpc/connection.py 2012-03-07 21:22:43.359960587 +0000
@@ -32,6 +32,8 @@

 """

+import errno
+import logging
 import socket, traceback, sys, threading
 from types import MethodType, FunctionType

@@ -43,6 +45,10 @@
 import bjsonrpc.jsonlib as json
 import select

+
+_log = logging.getLogger(__name__)
+
+
 class RemoteObject(object):
     """
         Represents a object in the server-side (or client-side when speaking from
@@ -406,8 +412,9 @@
                 try:
                     self._objects[objectname]._shutdown()
                 except Exception:
-                    print "Error when shutting down the object", type(self._objects[objectname]),":"
-                    print traceback.format_exc()
+                    _log.error("Error when shutting down the object %s:",
+                               type(self._objects[objectname]))
+                    _log.debug(traceback.format_exc())

                 del self._objects[objectname]
                 result = None
@@ -432,18 +439,18 @@
                 if len(funargs) > 40: 
                     funargs = funargs[:37] + "..."

-                print "(%s) In Handler method %s.%s(%s) " % (
+                _log.error("(%s) In Handler method %s.%s(%s) ",
                     req_object.__class__.__module__,
                     req_object.__class__.__name__,
                     req_method, 
                     funargs
                     )
-                print "\n".join([ "%s::%s:%d %s" % (
+                _log.debug("\n".join([ "%s::%s:%d %s" % (
                         filename, fnname, 
                         lineno, srcline  ) 
                     for filename, lineno, fnname, srcline 
-                    in traceback.extract_tb(etb)[1:] ])
-                print "Unhandled error: %s: %s" % (etype.__name__, evalue)
+                    in traceback.extract_tb(etb)[1:] ]))
+                _log.error("Unhandled error: %s: %s", etype.__name__, evalue)

                 del etb
                 if req_id is not None: 
@@ -527,10 +534,10 @@
                     else:
                         dispatch_item(item)
                 else: # Unknown format :-(
-                    print "Received message with unknown format type:" , type(item)
+                    _log.debug("Received message with unknown format type: %s" , type(item))
                     return False
             except Exception:
-                print traceback.format_exc()
+                _log.debug(traceback.format_exc())
                 return False
             return True
         finally:
@@ -579,7 +586,7 @@
             try:
                 txtResponse = json.dumps(response, self)
             except Exception, e:
-                print "An unexpected error ocurred when trying to create the message:", repr(e)
+                _log.error("An unexpected error ocurred when trying to create the message: %r", e)
                 response = {
                     'result': None, 
                     'error': "InternalServerError: " + repr(e), 
@@ -590,7 +597,7 @@
             try:
                 self.write(txtResponse)
             except TypeError:
-                print "response was:", repr(response)
+                _log.debug("response was: %r", response)
                 raise
         return True

@@ -647,12 +654,12 @@
         self.write_thread_semaphore.release() # notify new item.
         item['event'].wait(1)
         if not item['event'].isSet():
-            print "WARN: write thread doesn't process our abort command" 
+            _log.warning("write thread doesn't process our abort command")
         try:
             self.handler._shutdown()
         except Exception:
-            print "Error when shutting down the handler:"
-            print traceback.format_exc()
+            _log.error("Error when shutting down the handler: %s",
+                       traceback.format_exc())
         try:
             self._sck.shutdown(socket.SHUT_RDWR)
         except socket.error:
@@ -677,7 +684,7 @@
         self.write_lock.acquire()
         try:
             if self._debug_socket: 
-                print "<:%d:" % len(data), data[:130]
+                _log.debug("<:%d: %s", len(data), data[:130])

             self._wbuffer += list(str(data + '\n'))
             sbytes = 0
@@ -685,14 +692,14 @@
                 try:
                     sbytes = self._sck.send("".join(self._wbuffer))
                 except IOError:
-                    print "Read socket error: IOError (timeout: %s)" % (
-                        repr(self._sck.gettimeout())  )
-                    print traceback.format_exc(0)
+                    _log.debug("Read socket error: IOError (timeout: %r)",
+                        self._sck.gettimeout())
+                    _log.debug(traceback.format_exc(0))
                     return ''
                 except socket.error:
-                    print "Read socket error: socket.error (timeout: %s)" % (
-                        repr(self._sck.gettimeout())  )
-                    print traceback.format_exc(0)
+                    _log.debug("Read socket error: socket.error (timeout: %r)",
+                        self._sck.gettimeout())
+                    _log.debug(traceback.format_exc(0))
                     return ''
                 except:
                     raise
@@ -700,7 +707,7 @@
                     break
                 self._wbuffer[0:sbytes] = []
             if len(self._wbuffer):
-                print "warn: %d bytes left in write buffer" % len(self._wbuffer)
+                _log.warning("%d bytes left in write buffer", len(self._wbuffer))
             return len(self._wbuffer)
         finally:
             self.write_lock.release()
@@ -722,7 +729,7 @@
         try:
             data = self._readn()
             if len(data) and self._debug_socket: 
-                print ">:%d:" % len(data), data[:130]
+                _log.debug(">:%d: %s", len(data), data[:130])
             return data
         finally:
             self.read_lock.release()
@@ -751,14 +758,15 @@
             try:
                 item = self.write_thread_queue.pop(0)
             except IndexError: # pop from empty list?
-                print "WARN: write queue was empty??"
+                _log.warning("write queue was empty??")
                 continue
             abort = item.get("abort", False)
             event = item.get("event")
             write_data  = item.get("write_data")
             if write_data: item["result"] = self.write_now(write_data)
             if event: event.set()
-        if self._debug_socket: print "Writing thread finished."
+        if self._debug_socket:
+            _log.debug("Writing thread finished.")


     def write(self, data, timeout = None):
@@ -802,45 +810,42 @@
         """
         streambuffer = self._buffer
         pos = streambuffer.find('\n')
-        #print "read..."
+        #_log.debug("read...")
         #retry = 0
         while pos == -1:
             data = ''
             try:
                 data = self._sck.recv(2048)
             except IOError, inst:
-                print "Read socket error: IOError (timeout: %s)" % (
-                    repr(self._sck.gettimeout())  )
-                print inst.args
-                val = inst.args[0]
-                if val == 11: # Res. Temp. not available.
+                _log.debug("Read socket error: IOError%r (timeout: %r)",
+                    inst.args, self._sck.gettimeout())
+                if inst.errno == errno.EAGAIN:
                     if self._sck.gettimeout() == 0: # if it was too fast
                         self._sck.settimeout(5)
                         continue
                         #time.sleep(0.5)
                         #retry += 1
                         #if retry < 10:
-                        #    print "Retry ", retry
+                        #    _log.debug("Retry %s", retry)
                         #    continue
-                #print traceback.format_exc(0)
+                #_log.debug(traceback.format_exc(0))
                 return ''
             except socket.error, inst:
-                print "Read socket error: socket.error (timeout: %s)" % (
-                    repr(self._sck.gettimeout())  )
-                print inst.args
-                #print traceback.format_exc(0)
+                _log.error("Read socket error: socket.error%r (timeout: %r)", 
+                    inst.args, self._sck.gettimeout())
+                #_log.debug(traceback.format_exc(0))
                 return ''
             except:
                 raise
             if not data:
                 raise EofError(len(streambuffer))
-            #print "readbuf+:",repr(data)
+            #_log.debug("readbuf+: %r", data)
             streambuffer += data
             pos = streambuffer.find('\n')

         self._buffer = streambuffer[pos + 1:]
         streambuffer = streambuffer[:pos]
-        #print "read:", repr(buffer)
+        #_log.debug("read: %r", buffer)
         return streambuffer

     def serve(self):
diff -Naur --exclude '*.py?' --exclude '.*.swp' bjsonrpc-0.2.1-py2.7.old/bjsonrpc/request.py bjsonrpc-0.2.1-py2.7.new/bjsonrpc/request.py
--- bjsonrpc-0.2.1-py2.7.old/bjsonrpc/request.py    2011-06-04 10:45:40.000000000 +0000
+++ bjsonrpc-0.2.1-py2.7.new/bjsonrpc/request.py    2012-03-07 20:52:33.076621140 +0000
@@ -32,12 +32,17 @@

 """

+import logging
 from threading import Event
 import traceback

 from bjsonrpc.exceptions import ServerError
 import bjsonrpc.jsonlib as json

+
+_log = logging.getLogger(__name__)
+
+
 class Request(object):
     """
         Represents a request to the other end which may be not be completed yet.
@@ -118,8 +123,8 @@
             try:
                 callback(self)
             except Exception, exc:
-                print "Error on callback.", repr(exc)
-                print traceback.format_exc()
+                _log.error("Error on callback: %r", exc)
+                _log.debug(traceback.format_exc())

         self.event_response.set() # helper for threads.