X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fcommon%2Fhttp.py;h=9207cbc4c13a4903e4664f9e631bd4b364909fa2;hb=418b29773f44b656631082cc975ee8dd22e54473;hp=a74862220a646224690e4eacbe7569fcecf62fa4;hpb=e84eb31aded0cb62a5523422ddc4524f6e615209;p=osm%2Fosmclient.git

diff --git a/osmclient/common/http.py b/osmclient/common/http.py
index a748622..9207cbc 100644
--- a/osmclient/common/http.py
+++ b/osmclient/common/http.py
@@ -17,67 +17,98 @@
 from io import BytesIO
 import pycurl
 import json
+import logging
 
 
 class Http(object):
-
-    def __init__(self,url,user='admin',password='admin'):
+    def __init__(self, url, user="admin", password="admin"):
         self._url = url
         self._user = user
         self._password = password
         self._http_header = None
+        self._logger = logging.getLogger("osmclient")
 
-    def set_http_header(self,header):
+    def set_http_header(self, header):
         self._http_header = header
 
-    def _get_curl_cmd(self,endpoint):
+    def _get_curl_cmd(self, endpoint):
         curl_cmd = pycurl.Curl()
-        curl_cmd.setopt(pycurl.URL, self._url + endpoint )
-        curl_cmd.setopt(pycurl.SSL_VERIFYPEER,0)
-        curl_cmd.setopt(pycurl.SSL_VERIFYHOST,0)
-        curl_cmd.setopt(pycurl.USERPWD, '{}:{}'.format(self._user,self._password))
+        curl_cmd.setopt(pycurl.URL, self._url + endpoint)
+        curl_cmd.setopt(pycurl.SSL_VERIFYPEER, 0)
+        curl_cmd.setopt(pycurl.SSL_VERIFYHOST, 0)
+        curl_cmd.setopt(pycurl.USERPWD, "{}:{}".format(self._user, self._password))
         if self._http_header:
             curl_cmd.setopt(pycurl.HTTPHEADER, self._http_header)
         return curl_cmd
 
-    def get_cmd( self, endpoint ):
-
+    def get_cmd(self, endpoint):
         data = BytesIO()
-        curl_cmd=self._get_curl_cmd(endpoint)
-        curl_cmd.setopt(pycurl.HTTPGET,1)
+        curl_cmd = self._get_curl_cmd(endpoint)
+        curl_cmd.setopt(pycurl.HTTPGET, 1)
         curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
-        curl_cmd.perform() 
+        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()
         if data.getvalue():
+            self._logger.debug(
+                "Response DATA: {}".format(json.loads(data.getvalue().decode()))
+            )
             return json.loads(data.getvalue().decode())
         return None
 
-    def delete_cmd( self, endpoint ):
+    def delete_cmd(self, endpoint):
         data = BytesIO()
-        curl_cmd=self._get_curl_cmd(endpoint)
+        curl_cmd = self._get_curl_cmd(endpoint)
         curl_cmd.setopt(pycurl.CUSTOMREQUEST, "DELETE")
         curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
-        curl_cmd.perform() 
+        self._logger.info(
+            "Request METHOD: {} URL: {}".format("DELETE", 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()
         if data.getvalue():
+            self._logger.debug(
+                "Response DATA: {}".format(json.loads(data.getvalue().decode()))
+            )
             return json.loads(data.getvalue().decode())
         return None
 
-    def post_cmd( self, endpoint='', postfields_dict=None, formfile=None, ):
+    def post_cmd(
+        self,
+        endpoint="",
+        postfields_dict=None,
+        formfile=None,
+    ):
         data = BytesIO()
-        curl_cmd=self._get_curl_cmd(endpoint)
-        curl_cmd.setopt(pycurl.POST,1)
+        curl_cmd = self._get_curl_cmd(endpoint)
+        curl_cmd.setopt(pycurl.POST, 1)
         curl_cmd.setopt(pycurl.WRITEFUNCTION, data.write)
 
         if postfields_dict is not None:
-            jsondata=json.dumps(postfields_dict)
-            curl_cmd.setopt(pycurl.POSTFIELDS,jsondata)
+            jsondata = json.dumps(postfields_dict)
+            curl_cmd.setopt(pycurl.POSTFIELDS, jsondata)
 
         if formfile is not None:
-            curl_cmd.setopt(pycurl.HTTPPOST,[((formfile[0],(pycurl.FORM_FILE,formfile[1])))])
+            curl_cmd.setopt(
+                pycurl.HTTPPOST, [((formfile[0], (pycurl.FORM_FILE, formfile[1])))]
+            )
 
-        curl_cmd.perform() 
+        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()
         if data.getvalue():
+            self._logger.debug(
+                "Response DATA: {}".format(json.loads(data.getvalue().decode()))
+            )
             return json.loads(data.getvalue().decode())
         return None