X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fhttp.py;h=3d21465ce43cbc45437a961fcb5d0ceaa62b2be8;hb=refs%2Fchanges%2F06%2F8606%2F1;hp=7988d89a489b1365397265f8ba86ecb54b19114e;hpb=be96096ebd71c8d36c8375387f8e671f12eedfb0;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/http.py b/osmclient/sol005/http.py
index 7988d89..3d21465 100644
--- a/osmclient/sol005/http.py
+++ b/osmclient/sol005/http.py
@@ -17,7 +17,11 @@
 from io import BytesIO
 import pycurl
 import json
+import logging
+import copy
 from osmclient.common import http
+from osmclient.common.exceptions import OsmHttpException, NotFound
+
 
 class Http(http.Http):
 
@@ -26,10 +30,13 @@ class Http(http.Http):
         self._user = user
         self._password = password
         self._http_header = None
+        self._logger = logging.getLogger('osmclient')
 
     def _get_curl_cmd(self, endpoint):
+        self._logger.debug("")
         curl_cmd = pycurl.Curl()
-        #print self._url + endpoint
+        if self._logger.getEffectiveLevel() == logging.DEBUG:
+            curl_cmd.setopt(pycurl.VERBOSE, True)
         curl_cmd.setopt(pycurl.URL, self._url + endpoint)
         curl_cmd.setopt(pycurl.SSL_VERIFYPEER, 0)
         curl_cmd.setopt(pycurl.SSL_VERIFYHOST, 0)
@@ -38,23 +45,29 @@ class Http(http.Http):
         return curl_cmd
 
     def delete_cmd(self, endpoint):
+        self._logger.debug("")
         data = BytesIO()
         curl_cmd = self._get_curl_cmd(endpoint)
         curl_cmd.setopt(pycurl.CUSTOMREQUEST, "DELETE")
         curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
+        self._logger.info("Request METHOD: {} URL: {}".format("DELETE",self._url + endpoint))
         curl_cmd.perform()
         http_code = curl_cmd.getinfo(pycurl.HTTP_CODE)
-        #print 'HTTP_CODE: {}'.format(http_code)
+        self._logger.info("Response HTTPCODE: {}".format(http_code))
         curl_cmd.close()
+        self.check_http_response(http_code, data)
         # TODO 202 accepted should be returned somehow
         if data.getvalue():
-            return http_code, data.getvalue().decode()
+            data_text = data.getvalue().decode()
+            self._logger.verbose("Response DATA: {}".format(data_text))
+            return http_code, data_text
         else:
             return http_code, None
 
     def send_cmd(self, endpoint='', postfields_dict=None,
                  formfile=None, filename=None,
                  put_method=False, patch_method=False):
+        self._logger.debug("")
         data = BytesIO()
         curl_cmd = self._get_curl_cmd(endpoint)
         if put_method:
@@ -66,6 +79,13 @@ class Http(http.Http):
 
         if postfields_dict is not None:
             jsondata = json.dumps(postfields_dict)
+            if 'password' in postfields_dict:
+                postfields_dict_copy = copy.deepcopy(postfields_dict)
+                postfields_dict_copy['password']='******'
+                jsondata_log = json.dumps(postfields_dict_copy)
+            else:
+                jsondata_log = jsondata
+            self._logger.verbose("Request POSTFIELDS: {}".format(jsondata_log))
             curl_cmd.setopt(pycurl.POSTFIELDS, jsondata)
         elif formfile is not None:
             curl_cmd.setopt(
@@ -74,20 +94,32 @@ class Http(http.Http):
                            (pycurl.FORM_FILE,
                             formfile[1])))])
         elif filename is not None:
-            with open(filename, 'r') as stream:
+            with open(filename, 'rb') as stream:
                 postdata=stream.read()
+            self._logger.verbose("Request POSTFIELDS: Binary content")
             curl_cmd.setopt(pycurl.POSTFIELDS, postdata)
 
+        if put_method:
+            self._logger.info("Request METHOD: {} URL: {}".format("PUT",self._url + endpoint))
+        elif patch_method:
+            self._logger.info("Request METHOD: {} URL: {}".format("PATCH",self._url + endpoint))
+        else:
+            self._logger.info("Request METHOD: {} URL: {}".format("POST",self._url + endpoint))
         curl_cmd.perform()
         http_code = curl_cmd.getinfo(pycurl.HTTP_CODE)
+        self._logger.info("Response HTTPCODE: {}".format(http_code))
         curl_cmd.close()
+        self.check_http_response(http_code, data)
         if data.getvalue():
-            return http_code, data.getvalue().decode()
+            data_text = data.getvalue().decode()
+            self._logger.verbose("Response DATA: {}".format(data_text))
+            return http_code, data_text
         else:
             return http_code, None
 
     def post_cmd(self, endpoint='', postfields_dict=None,
                  formfile=None, filename=None):
+        self._logger.debug("")
         return self.send_cmd(endpoint=endpoint,
                              postfields_dict=postfields_dict,
                              formfile=formfile,
@@ -96,6 +128,7 @@ class Http(http.Http):
 
     def put_cmd(self, endpoint='', postfields_dict=None,
                 formfile=None, filename=None):
+        self._logger.debug("")
         return self.send_cmd(endpoint=endpoint,
                              postfields_dict=postfields_dict,
                              formfile=formfile,
@@ -104,6 +137,7 @@ class Http(http.Http):
 
     def patch_cmd(self, endpoint='', postfields_dict=None,
                 formfile=None, filename=None):
+        self._logger.debug("")
         return self.send_cmd(endpoint=endpoint,
                              postfields_dict=postfields_dict,
                              formfile=formfile,
@@ -111,14 +145,32 @@ class Http(http.Http):
                              put_method=False, patch_method=True)
 
     def get2_cmd(self, endpoint):
+        self._logger.debug("")
         data = BytesIO()
         curl_cmd = self._get_curl_cmd(endpoint)
         curl_cmd.setopt(pycurl.HTTPGET, 1)
         curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
+        self._logger.info("Request METHOD: {} URL: {}".format("GET",self._url + endpoint))
         curl_cmd.perform()
         http_code = curl_cmd.getinfo(pycurl.HTTP_CODE)
+        self._logger.info("Response HTTPCODE: {}".format(http_code))
         curl_cmd.close()
+        self.check_http_response(http_code, data)
         if data.getvalue():
-            return http_code, data.getvalue().decode()
+            data_text = data.getvalue().decode()
+            self._logger.verbose("Response DATA: {}".format(data_text))
+            return http_code, data_text
         return http_code, None
 
+    def check_http_response(self, http_code, data):
+        if http_code >= 300:
+            resp = ""
+            if data.getvalue():
+                data_text = data.getvalue().decode()
+                self._logger.verbose("Response {} DATA: {}".format(http_code, data_text))
+                resp = ": " + data_text
+            else:
+                self._logger.verbose("Response {}".format(http_code))
+            if http_code == 404:
+                raise NotFound("Error {}{}".format(http_code, resp))
+            raise OsmHttpException("Error {}{}".format(http_code, resp))