ebs-linuxnode-core 3.2.0__tar.gz → 3.2.2__tar.gz

{ebs-linuxnode-core-3.2.0/ebs_linuxnode_core.egg-info → ebs_linuxnode_core-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ebs-linuxnode-core
-Version: 3.2.0
+Version: 3.2.2
 Summary: Twisted based linux application node core
 Home-page: https://github.com/ebs-universe/ebs-linuxnode-core
 Author: Chintalagiri Shashank
@@ -12,3 +12,15 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Operating System :: POSIX :: Linux
+Requires-Dist: six
+Requires-Dist: setuptools-scm
+Requires-Dist: appdirs
+Requires-Dist: twisted[tls]
+Requires-Dist: SQLAlchemy
+Requires-Dist: arrow
+Requires-Dist: raspi_system
+Requires-Dist: netifaces
+Requires-Dist: ifcfg
+Requires-Dist: psutil
+Requires-Dist: memory_tempfile
+Requires-Dist: treq

{ebs-linuxnode-core-3.2.0 → ebs_linuxnode_core-3.2.2}/ebs/linuxnode/core/basenode.py

@@ -10,6 +10,7 @@ from .shell import BaseShellMixin
 from .http import HttpClientMixin
 from .resources import ResourceManagerMixin
 from .background import BackgroundCoreMixin
+from .tempfs import TempFSMixin
 
 
 class BaseIoTNode(BackgroundCoreMixin,
@@ -17,6 +18,7 @@ class BaseIoTNode(BackgroundCoreMixin,
                   HttpClientMixin,
                   BaseShellMixin,
                   NodeBusyMixin,
+                  TempFSMixin,
                   NodeLoggingMixin,
                   NodeIDMixin):
     _has_gui = False

{ebs-linuxnode-core-3.2.0 → ebs_linuxnode_core-3.2.2}/ebs/linuxnode/core/http.py

@@ -181,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
         )
@@ -211,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.2.0 → ebs_linuxnode_core-3.2.2}/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.2.2/ebs/linuxnode/core/tempfs.py

@@ -0,0 +1,69 @@
+
+
+import shutil
+import tempfile
+from memory_tempfile import MemoryTempfile
+
+from .basemixin import BaseMixin
+from .log import NodeLoggingMixin
+from .config import ElementSpec
+from .config import ItemSpec
+
+
+class TempFSMixin(NodeLoggingMixin, BaseMixin):
+    def __init__(self, *args, **kwargs):
+        super(TempFSMixin, self).__init__(*args, **kwargs)
+        self._tempfile = None
+        self._tempdir = None
+
+    def install(self):
+        super(TempFSMixin, self).install()
+        _elements = {
+            'tmpfs_prefer_memory': ElementSpec('tmpfs', 'memory_prefer', ItemSpec(bool, fallback=True)),
+            'tmpfs_force_memory': ElementSpec('tmpfs', 'memory_force', ItemSpec(bool, fallback=False)),
+            'tmpfs_clean_on_exit': ElementSpec('tmpfs', 'clean_on_exit', ItemSpec(bool, fallback=True)),
+        }
+        for name, spec in _elements.items():
+            self.config.register_element(name, spec)
+
+    def _tempfile_init(self):
+        if self.config.tmpfs_force_memory:
+            # TODO This should use MemoryTempfile to find a tmpfs or ramfs path,
+            #  and fail (throw exception) if a suitable path does not exist.
+            #  - The assumption is going to be that it will be upto the deployment
+            #    to ensure a suitable path exists.
+            #  - Mounting here is not viable due to permission issues
+            #  - Using pyfilesystem2 is not viable since all users will also need
+            #    to treat it as a pyfilesystem2 object, and external processes
+            #    cannot be handed this path.
+            raise NotImplementedError
+        elif self.config.tmpfs_prefer_memory:
+            self._tempfile = MemoryTempfile()
+        else:
+            self._tempfile = tempfile
+
+    @property
+    def tempfile(self):
+        if not self._tempfile:
+            self._tempfile_init()
+        return self._tempfile
+
+    @property
+    def tempdir(self):
+        if not self._tempdir:
+            self._tempdir = self.tempfile.mkdtemp()
+        return self._tempdir
+
+    def start(self):
+        super().start()
+        self.log.debug(f"Using tempfs: {self.tempfile.gettempdir()}")
+        self.log.info(f"Using tempdir: {self.tempdir}")
+
+    def stop(self):
+        if self.tempdir:
+            if self.config.tmpfs_clean_on_exit:
+                self.log.info(f"Cleaning up tempdir: {self.tempdir}")
+                shutil.rmtree(self.tempdir)
+            else:
+                self.log.info(f"Not cleaning up tempdir: {self.tempdir}")
+        super().stop()

{ebs-linuxnode-core-3.2.0 → ebs_linuxnode_core-3.2.2/ebs_linuxnode_core.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ebs-linuxnode-core
-Version: 3.2.0
+Version: 3.2.2
 Summary: Twisted based linux application node core
 Home-page: https://github.com/ebs-universe/ebs-linuxnode-core
 Author: Chintalagiri Shashank
@@ -12,3 +12,15 @@ Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Operating System :: POSIX :: Linux
+Requires-Dist: six
+Requires-Dist: setuptools-scm
+Requires-Dist: appdirs
+Requires-Dist: twisted[tls]
+Requires-Dist: SQLAlchemy
+Requires-Dist: arrow
+Requires-Dist: raspi_system
+Requires-Dist: netifaces
+Requires-Dist: ifcfg
+Requires-Dist: psutil
+Requires-Dist: memory_tempfile
+Requires-Dist: treq

{ebs-linuxnode-core-3.2.0 → ebs_linuxnode_core-3.2.2}/ebs_linuxnode_core.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ ebs/linuxnode/core/log.py
 ebs/linuxnode/core/nodeid.py
 ebs/linuxnode/core/resources.py
 ebs/linuxnode/core/shell.py
+ebs/linuxnode/core/tempfs.py
 ebs/linuxnode/db/__init__.py
 ebs/linuxnode/db/sequence.py
 ebs_linuxnode_core.egg-info/PKG-INFO

{ebs-linuxnode-core-3.2.0 → ebs_linuxnode_core-3.2.2}/ebs_linuxnode_core.egg-info/requires.txt

@@ -8,4 +8,5 @@ raspi_system
 netifaces
 ifcfg
 psutil
+memory_tempfile
 treq

{ebs-linuxnode-core-3.2.0 → ebs_linuxnode_core-3.2.2}/setup.py

@@ -15,6 +15,7 @@ _requires = [
     # System
     'ifcfg',
     'psutil',
+    'memory_tempfile',
 
     # HTTP Client
     'treq',