Merge branch 'master' of git.dorfsvald.net:ewandor/portainer_updater

main.py

@@ -2,6 +2,7 @@
 
 import os
 import json
+from time import sleep
 
 import requests
 
@@ -27,21 +28,30 @@ class PortainerClient:
             "X-API-Key": self.access_token
         }
 
-    def list_endpoints(self):
-        response = requests.get(f"{self.api_url}/endpoints", headers=self._get_headers())
+    def _get(self, uri):
+        response = requests.get(f"{self.api_url}/{uri}", headers=self._get_headers())
         return response.json()
 
+    def list_endpoints(self):
+        return self._get("endpoints")
+
     def list_stacks(self, endpoint_id=None):
         filters = f'?filters={{"EndpointID":{endpoint_id}}}' if endpoint_id else ""
-        response = requests.get(f"{self.api_url}/stacks{filters}", headers=self._get_headers())
-        return response.json()
+        return self._get(f'stacks{filters}')
 
     def get_stack(self, stack_id):
-        response = requests.get(f"{self.api_url}/stacks/{stack_id}", headers=self._get_headers())
-        return response.json()
+        return self._get(f'stacks/{stack_id}')
 
     def get_stack_file(self, stack_id):
-        response = requests.get(f"{self.api_url}/stacks/{stack_id}/file", headers=self._get_headers())
+        return self._get(f'stacks/{stack_id}/file')
+
+    def _put(self, uri, payload):
+        response = requests.put(
+            f"{self.api_url}/uri",
+            headers=self._get_headers(),
+            json=payload
+        )
+
         return response.json()
 
     def upgrade_stack(self, stack):
@@ -52,22 +62,12 @@ class PortainerClient:
             "StackFileContent": file_response["StackFileContent"],
             "Env": stack["Env"]
         }
-        response = requests.put(
-            f"{self.api_url}/stacks/{stack['Id']}?endpointId={stack['EndpointId']}",
-            headers=self._get_headers(),
-            json=payload
-        )
 
-        return response.json()
+        return self._put(f"stacks/{stack['Id']}?endpointId={stack['EndpointId']}", payload)
 
     def list_stack_containers(self, endpoint, stack_name):
         filters = '{"label":["com.docker.compose.project=' + stack_name + '"]}'
-        response = requests.get(
-            f"{self.api_url}/endpoints/{endpoint}/docker/containers/json?all=1&filters={filters}",
-            headers=self._get_headers()
-        )
-
-        return response.json()
+        return self._get(f'endpoints/{endpoint}/docker/containers/json?all=1&filters={filters}')
 
     def update_image(self, endpoint, image):
         response = requests.post(
@@ -88,6 +88,14 @@ class PortainerClient:
             headers=self._get_headers()
         )
 
+    def ping_server(self):
+        try:
+            r = requests.get(f"{self.api_url}/", headers=self._get_headers())
+        except requests.exceptions.ConnectionError:
+            return False
+
+        return r.status_code == 200
+
 
 def update_repositories():
     for repo_path in config.git_repositories:
@@ -136,6 +144,9 @@ def upgrade_endpoint_stack(client, endpoint):
                 print(f"{stack_name} was updated. Restarting...")
                 if endpoint_id == 2 and stack_name in ('portainer', 'traefik'):
                     upgrade_local_stack(stack)
+                    while not client.ping_server():
+                        print("Waiting for server to be back online...")
+                        sleep(1)
                 else:
                     client.upgrade_stack(stack)
                 print(f"{stack_name} restarted.")