Bugfix rest url et attente geoserver

gpf_agent_geoserver/agent_geoserver.py

@@ -114,8 +114,14 @@ class GeoserverAgent(PublishAgent):
         self.pg_pass = pg_pass
         self.work_dir = work_dir
 
+        geoserver_url = geoserver_url.rstrip("/")
+        if not geoserver_url.endswith("rest"):
+            geoserver_url = geoserver_url + "/rest"
+
         self.geoserver = GeoserverCustom(
-            service_url=geoserver_url, username=geoserver_user, password=geoserver_pass
+            service_url=geoserver_url,
+            username=geoserver_user,
+            password=geoserver_pass,
         )
 
         logger.info("En attente du démarrage de Geoserver")
@@ -172,8 +178,9 @@ class GeoserverAgent(PublishAgent):
         while time.time() < mustend:
             try:
                 version = self.geoserver.get_version()
-                logger.debug(f"AGENT GEOSERVER : Geoserver version - {version}")
-                return True
+                if version != "2.2.x":
+                    logger.debug(f"AGENT GEOSERVER : Geoserver version - {version}")
+                    return True
             except Exception:
                 version = None
             time.sleep(period)