ebs-linuxnode-core 3.1.6__tar.gz → 3.2.1__tar.gz

{ebs-linuxnode-core-3.1.6/ebs_linuxnode_core.egg-info → ebs-linuxnode-core-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ebs-linuxnode-core
-Version: 3.1.6
+Version: 3.2.1
 Summary: Twisted based linux application node core
 Home-page: https://github.com/ebs-universe/ebs-linuxnode-core
 Author: Chintalagiri Shashank

{ebs-linuxnode-core-3.1.6 → ebs-linuxnode-core-3.2.1}/ebs/linuxnode/core/http.py

@@ -43,6 +43,9 @@ class HTTPError(Exception):
     def __init__(self, response):
         self.response = response
 
+    def __repr__(self):
+        return f"HTTP Response : {self.response}"
+
 
 _http_errors = (HTTPError, DNSLookupError, NoRouteError, ConnectionRefusedError,
                 TimeoutError, ConnectError, ResponseNeverReceived)
@@ -178,20 +181,22 @@ class HttpClientMixin(NodeBusyMixin, NodeLoggingMixin, BaseMixin):
         return url
 
     @staticmethod
-    def _strip_auth(kwargs):
-        if 'headers' not in kwargs.keys():
-            return kwargs
-        if b'Authorization' in kwargs['headers'].keys():
-            rv = copy.deepcopy(kwargs)
-            rv['headers'][b'Authorization'] = rv['headers'][b'Authorization'][:10] + b'...'
-            return rv
-        return kwargs
+    def _sanitize(kwargs):
+        response = {k: v for k, v in kwargs.items() if k not in {'_files'}}
+        if 'headers' not in response.keys():
+            return response
+        if b'Authorization' in response['headers'].keys():
+            new_headers = copy.deepcopy(response['headers'])
+            new_headers[b'Authorization'] = new_headers[b'Authorization'][:10] + b'...'
+            response['headers'] = new_headers
+            return response
+        return response
 
     def http_get(self, url, **kwargs):
         self.log.debug("Executing HTTP GET Request\n"
                        " to URL {url}\n"
                        " with kwargs {kwargs}",
-                       url=url, kwargs=self._strip_auth(kwargs))
+                       url=url, kwargs=self._sanitize(kwargs))
         deferred_response = self.http_semaphore.run(
             self.http_client.get, url, **kwargs
         )
@@ -208,7 +213,7 @@ class HttpClientMixin(NodeBusyMixin, NodeLoggingMixin, BaseMixin):
         self.log.debug("Executing HTTP Post Request\n"
                        " to URL {url}\n"
                        " with kwargs {kwargs}",
-                       url=url, kwargs=self._strip_auth(kwargs))
+                       url=url, kwargs=self._sanitize(kwargs))
         deferred_response = self.http_semaphore.run(
             self.http_client.post, url, **kwargs
         )

{ebs-linuxnode-core-3.1.6 → ebs-linuxnode-core-3.2.1}/ebs/linuxnode/core/log.py

@@ -4,6 +4,7 @@ import os
 import io
 import sys
 import time
+import zipfile
 from twisted import logger
 from twisted.logger import LogLevel
 from twisted.logger import LogLevelFilterPredicate
@@ -102,6 +103,21 @@ class NodeLoggingMixin(ConfigMixin, BaseMixin):
         os.makedirs(user_log_dir(self.appname), exist_ok=True)
         return user_log_dir(self.appname)
 
+    def log_build_package(self, out_path=None):
+        if not out_path:
+            ctime = datetime.now().strftime("%Y%m%d%H%M%S")
+            out_path = os.path.join('/tmp', f'{self.id}.{ctime}.logs.zip')
+
+        with zipfile.ZipFile(out_path, 'w', zipfile.ZIP_DEFLATED) as zip_file:
+            for root, dirs, files in os.walk(self.log_dir):
+                for file_or_dir in files + dirs:
+                    zip_file.write(
+                        os.path.join(root, file_or_dir),
+                        os.path.relpath(os.path.join(root, file_or_dir), self.log_dir)
+                    )
+
+        return out_path
+
     def exim_install(self):
         super(NodeLoggingMixin, self).exim_install()
         self.exim.register_export('logs', self.log_dir)

{ebs-linuxnode-core-3.1.6 → ebs-linuxnode-core-3.2.1/ebs_linuxnode_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ebs-linuxnode-core
-Version: 3.1.6
+Version: 3.2.1
 Summary: Twisted based linux application node core
 Home-page: https://github.com/ebs-universe/ebs-linuxnode-core
 Author: Chintalagiri Shashank