Update client

Author: radaron

back_channel_client/back_channel_client.py

@@ -18,7 +18,7 @@ class BackChannelClient:  # pylint: disable=too-few-public-methods
     CONFIG_PATH = os.path.join(CONFIG_FOLDER_PATH, "config.ini")
     DEFAULT_CONFIG = {
         "connection": {
-            "server_address": "localhost",
+            "server_address": "http://localhost",
             "ssh_username": "root",
             "ssh_port": "22",
             "period_time_sec": "30",
@@ -37,7 +37,7 @@ def _init_logger(self):
             logging.Formatter("back-channel-client %(name)s: %(levelname)s %(message)s")
         )
         logger = logging.getLogger("back-channel-client")
-        # logger.addHandler(syslog)
+        logger.addHandler(syslog)
         logger.setLevel(logging.INFO)
         return logger
 
@@ -69,7 +69,7 @@ def _server_hostname(self):
 
     def _get_order(self):
         request = requests.get(
-            url=f"{self._server_address}/api/order",
+            url=f"{self._server_address}/api/v1/client/order",
             headers={
                 "name": self._config["connection"]["client_name"],
                 "username": self._config["connection"]["ssh_username"],
@@ -80,17 +80,16 @@ def _get_order(self):
 
     def _send_metrics(self):
         metrics = self._collect_metrics()
-        url = f"{self._server_address}/api/metric"
+        url = f"{self._server_address}/api/v1/client/metric"
         client_name = self._config["connection"]["client_name"]
         data = {
-            "name": client_name,
-            "uptime": metrics["uptime_hous"],
+            "uptime": metrics["uptime_hours"],
             "cpu_usage": metrics["cpu_percent"],
             "memory_usage": metrics["mem_percent"],
             "disk_usage": metrics["disk_usage"],
             "temperature": metrics["temperature"],
         }
-        headers = {"Content-type": "application/json"}
+        headers = {"Content-type": "application/json", "name": client_name}
         requests.put(url, data=json.dumps(data), headers=headers, timeout=5)
 
     def _collect_metrics(self):
@@ -101,7 +100,7 @@ def _collect_metrics(self):
             else "/"
         )
         return {
-            "uptime_hous": int(uptime_sec / 3600),
+            "uptime_hours": int(uptime_sec),
             "mem_percent": int(psutil.virtual_memory().percent),
             "cpu_percent": self._get_cpu_avarage_load(),
             "disk_usage": int(psutil.disk_usage(disk_path).percent),
@@ -132,13 +131,14 @@ def _get_cpu_avarage_load():
             return -1
 
     def run(self):
-        self._logger.info("Starting rpi-remote client...")
+        self._logger.info("Starting back channel client...")
         while True:
             try:
-                if data := self._get_order():
+                data = self._get_order()
+                if port := data.get("port"):
                     forwarder = ClientForwarder(
                         host=self._server_hostname,
-                        port=data["port"],
+                        port=port,
                         local_port=self._config["connection"]["ssh_port"],
                     )
                     forwarder.start()
@@ -155,3 +155,7 @@ def run(self):
 def main():
     client = BackChannelClient()
     client.run()
+
+
+if __name__ == "__main__":
+    main()

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "back-channel-client"
-version = "0.1.0"
+version = "0.2.0"
 authors = [
   { name="Aron Radics", email="radics.aron.jozsef@gmail.com" },
 ]