Track and log errors at connection and clients mod

diff --git a/kamaki/clients/__init__.py b/kamaki/clients/__init__.py
index be1d9a1..3de9022 100644 (file)
--- a/kamaki/clients/__init__.py
+++ b/kamaki/clients/__init__.py
@@ -36,6 +36,8 @@ from json import dumps, loads
 from time import time
 import logging
 from kamaki.clients.connection.kamakicon import KamakiHTTPConnection
+from kamaki.clients.connection.errors import HTTPConnectionError
+from kamaki.clients.connection.errors import HTTPResponseError
 
 sendlog = logging.getLogger('clients.send')
 recvlog = logging.getLogger('clients.recv')
@@ -44,6 +46,7 @@ recvlog = logging.getLogger('clients.recv')
 class ClientError(Exception):
     def __init__(self, message, status=0, details=[]):
         try:
+            message += '' if message and message[-1] == '\n' else '\n'
             serv_stat, sep, new_msg = message.partition('{')
             new_msg = sep + new_msg
             json_msg = loads(new_msg)
@@ -202,12 +205,16 @@ class Client(object):
             if r.content:
                 recvlog.debug(r.content)
 
-        except Exception as err:
-            from traceback import print_stack
-            recvlog.debug(print_stack)
+        except (HTTPResponseError, HTTPConnectionError) as err:
+            from traceback import format_stack
+            recvlog.debug('\n'.join(['%s' % type(err)] + format_stack()))
             self.http_client.reset_headers()
             self.http_client.reset_params()
-            raise ClientError('%s' % err, status=getattr(err, 'status', 0))
+            errstr = '%s' % err
+            if not errstr:
+                errstr = ('%s' % type(err))[7:-2]
+            raise ClientError('%s\n' % errstr,
+                status=getattr(err, 'status', 0))
 
         self.http_client.reset_headers()
         self.http_client.reset_params()

diff --git a/kamaki/clients/connection/kamakicon.py b/kamaki/clients/connection/kamakicon.py
index b7c45b1..f002bd7 100644 (file)
--- a/kamaki/clients/connection/kamakicon.py
+++ b/kamaki/clients/connection/kamakicon.py
@@ -32,7 +32,6 @@
 # or implied, of GRNET S.A.
 
 from urlparse import urlparse
-#from objpool.http import get_http_connection
 from objpool.http import get_http_connection
 from kamaki.clients.connection import HTTPConnection, HTTPResponse
 from kamaki.clients.connection.errors import HTTPConnectionError
@@ -177,6 +176,9 @@ class KamakiHTTPConnection(HTTPConnection):
                 headers=http_headers,
                 body=data)
         except Exception as err:
+            from traceback import format_stack
+            from kamaki.clients import recvlog
+            recvlog.debug('\n'.join(['%s' % type(err)] + format_stack()))
             conn.close()
             if isinstance(err, gaierror):
                 raise HTTPConnectionError(

diff --git a/kamaki/clients/connection/tests.py b/kamaki/clients/connection/tests.py
deleted file mode 100644 (file)
index c1877d7..0000000
--- a/kamaki/clients/connection/tests.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 2011 GRNET S.A. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or
-# without modification, are permitted provided that the following
-# conditions are met:
-#
-#   1. Redistributions of source code must retain the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer.
-#
-#   2. Redistributions in binary form must reproduce the above
-#      copyright notice, this list of conditions and the following
-#      disclaimer in the documentation and/or other materials
-#      provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
-# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and
-# documentation are those of the authors and should not be
-# interpreted as representing official policies, either expressed
-# or implied, of GRNET S.A.
-
-import unittest
-import sys
-from StringIO import StringIO
-from time import sleep
-
-from kamaki.clients.connection.kamakicon import KamakiHTTPConnection
-
-
-class testKamakiCon(unittest.TestCase):
-    def setUp(self):
-        self.async_pool = None
-        self.conn1 = KamakiHTTPConnection()
-        self.conn2 = KamakiHTTPConnection()
-        self.conn3 = KamakiHTTPConnection()
-        self.conn4 = KamakiHTTPConnection()
-        account = 'saxtouri@grnet.gr'
-
-        self.conn1.url =\
-            'https://pithos.okeanos.io/v1/%s/pithos?path=files' % account
-        self.conn1.set_header('X-Auth-Token', '0TpoyAXqJSPxLdDuZHiLOA==')
-        self.conn2.url = 'https://pithos.okeanos.io/v1/%s/pithos' % account
-        self.conn2.set_header('X-Auth-Token', '0TpoyAXqJSPxLdDuZHiLOA==')
-        self.conn3.url =\
-            'https://pithos.okeanos.io/v1/%s/pithos?path=subdir' % account
-        self.conn3.set_header('X-Auth-Token', '0TpoyAXqJSPxLdDuZHiLOA==')
-        self.conn4.url = 'https://pithos.okeanos.io/v1/%s' % account
-        self.conn4.set_header('X-Auth-Token', '0TpoyAXqJSPxLdDuZHiLOA==')
-
-    def tearDown(self):
-        pass
-
-    """
-    def _get_async_content(self, con, **kwargs):
-        class SilentGreenlet(gevent.Greenlet):
-            def _report_error(self, exc_info):
-                _stderr = None
-                try:
-                    _stderr = sys._stderr
-                    sys.stderr = StringIO()
-                    gevent.Greenlet._report_error(self, exc_info)
-                finally:
-                    sys.stderr = _stderr
-        POOL_SIZE = 2
-        if self.async_pool is None:
-            self.async_pool = gevent.pool.Pool(size=POOL_SIZE)
-        g = SilentGreenlet(self._get_content_len, con, **kwargs)
-        self.async_pool.start(g)
-        return g
-    """
-
-    def _get_content_len(self, con, **kwargs):
-        r = con.perform_request('GET', **kwargs)
-        return len(r.content)
-
-    def test_gevents(self):
-        h1 = self._get_async_content(self.conn1)
-        h2 = self._get_async_content(self.conn2)
-        h3 = self._get_async_content(self.conn3)
-        h4 = self._get_async_content(self.conn2,
-            async_headers={'X-Auth-Token': 'FAKETOKEN'})
-        h5 = self._get_async_content(self.conn1)
-
-        while not (h1.ready()\
-            and h2.ready()\
-            and h3.ready()\
-            and h4.ready()\
-            and h5.ready()):
-            sleep(.000001)
-
-        r1 = h1.value
-        r2 = h2.value
-        # r3 = h3.value
-        r4 = h4.value
-        r5 = h5.value
-        self.assertEqual(r1, r5)
-        self.assertNotEqual(r2, r4)
-        #print('1:%s 2:%s 3:%s 4:%s 5:%s'%(r1, r2, r3, r4, r5))
-
-if __name__ == '__main__':
-    suiteFew = unittest.TestSuite()
-    suiteFew.addTest(unittest.makeSuite(testKamakiCon))
-    unittest.TextTestRunner(verbosity=2).run(suiteFew)