Upd with check error write

Author: joente

pylibagent/agent.py

@@ -12,6 +12,7 @@
 from setproctitle import setproctitle
 from .logger import setup_logger
 from .check import CheckBase
+from .exceptions import CheckException
 
 
 class SendDataException(Exception):
@@ -140,7 +141,10 @@ async def announce(self, asset_name: Optional[str] = None,
             logging.error(f'announce failed: {msg}')
             exit(1)
 
-    async def send_data(self, check_key: str, check_data: dict,
+    async def send_data(self,
+                        check_key: str,
+                        check_data: Optional[dict] = None,
+                        check_error: Optional[CheckException] = None,
                         timestamp: Optional[int] = None,
                         runtime: Optional[float] = None):
         # The latter strings shouldn't start with a slash. If they start with a
@@ -157,10 +161,15 @@ async def send_data(self, check_key: str, check_data: dict,
         timestamp = timestamp or int(time.time())
         data = {
             "version": self.version,
-            "data": check_data,
             "timestamp": timestamp,
         }
 
+        if check_data is not None:
+            data['data'] = check_data
+
+        if check_error is not None:
+            data['error'] = check_error.to_dict()
+
         if runtime is not None:
             data["runtime"] = runtime
 
@@ -256,11 +265,24 @@ async def _check_loop(self, check: Type[CheckBase]):
                 if await self._disabled_checks.is_disabled(self, check.key):
                     logging.debug(f'check {check.key} is disabled')
                 else:
-                    check_data = \
-                        await asyncio.wait_for(check.run(), timeout=timeout)
-                    await self.send_data(check.key, check_data)
-            except asyncio.TimeoutError:
-                logging.error(f'check error ({check.key}): timed out')
+                    check_data = None
+                    check_error = None
+                    try:
+                        check_data = await asyncio.wait_for(
+                            check.run(),
+                            timeout=timeout)
+                    except asyncio.TimeoutError:
+                        check_error = CheckException('timed out')
+                    except CheckException as e:
+                        check_error = e
+                    except Exception as e:
+                        msg = str(e) or type(e).__name__
+                        check_error = CheckException(msg)
+
+                    await self.send_data(check.key, check_data, check_error)
+                    if check_error is not None:
+                        raise check_error
+
             except SendDataException as e:
                 logging.error(str(e))
             except Exception as e:

pylibagent/exceptions.py

@@ -0,0 +1,15 @@
+from .severity import Severity
+
+
+class CheckException(Exception):
+    """CheckException is the basic check exception."""
+    def __init__(self, msg: str, severity: Severity = Severity.MEDIUM):
+        assert msg, 'CheckException message must not be empty'
+        self.severity = severity
+        super().__init__(msg)
+
+    def to_dict(self):
+        return {
+            "message": self.__str__(),
+            "severity": self.severity.value
+        }

pylibagent/severity.py

@@ -0,0 +1,7 @@
+from enum import Enum
+
+
+class Severity(Enum):
+    HIGH = 0
+    MEDIUM = 1
+    LOW = 2

pylibagent/version.py

@@ -1 +1 @@
-__version__ = '1.0.0'
+__version__ = '1.0.1'