Merge branch 'issue3290' of github.com:nicolargo/glances into issue3290

glances/plugins/fs/__init__.py

@@ -136,6 +136,15 @@ class FsPlugin(GlancesPluginModel):
 
         return self.stats
 
+    @GlancesPluginModel._exit_after(3)
+    def get_all_stats_partitions(self):
+        """Return all partitions."""
+        try:
+            return psutil.disk_partitions(all=True)
+        except (UnicodeDecodeError, PermissionError):
+            logger.debug("Plugin - fs: PsUtil fetch failed")
+            return []
+
     def update_local(self):
         """Update the FS stats using the input method."""
         # Init new stats

glances/plugins/plugin/model.py

@@ -14,6 +14,12 @@ I am your father...
 
 import copy
 import re
+import threading
+
+try:
+    import thread
+except ImportError:
+    import _thread as thread
 
 from glances.actions import GlancesActions
 from glances.events_list import glances_events
@@ -1212,7 +1218,25 @@ class GlancesPluginModel:
 
         return wrapper
 
+    def _exit_after(second):
+        """Exit the function if it takes more than 'second' seconds to complete."""
+
+        def outer(fn):
+            def inner(*args, **kwargs):
+                timer = threading.Timer(second, thread.interrupt_main, args=[fn.__name__])
+                timer.start()
+                try:
+                    result = fn(*args, **kwargs)
+                finally:
+                    timer.cancel()
+                return result
+
+            return inner
+
+        return outer
+
     # Mandatory to call the decorator in child classes
     _check_decorator = staticmethod(_check_decorator)
     _log_result_decorator = staticmethod(_log_result_decorator)
     _manage_rate = staticmethod(_manage_rate)
+    _exit_after = staticmethod(_exit_after)