OpenGeodeWeb-Back 6.5.1__tar.gz → 6.5.2__tar.gz

{opengeodeweb_back-6.5.1/src/OpenGeodeWeb_Back.egg-info → opengeodeweb_back-6.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.5.1
+Version: 6.5.2
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back

{opengeodeweb_back-6.5.1 → opengeodeweb_back-6.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "OpenGeodeWeb-Back"
-version = "6.5.1"
+version = "6.5.2"
 dynamic = ["dependencies"]
 authors = [{ name = "Geode-solutions", email = "team-web@geode-solutions.com" }]
 description = "OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem"

{opengeodeweb_back-6.5.1 → opengeodeweb_back-6.5.2/src/OpenGeodeWeb_Back.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: OpenGeodeWeb-Back
-Version: 6.5.1
+Version: 6.5.2
 Summary: OpenGeodeWeb-Back is an open source framework that proposes handy python functions and wrappers for the OpenGeode ecosystem
 Author-email: Geode-solutions <team-web@geode-solutions.com>
 Project-URL: Homepage, https://github.com/Geode-solutions/OpenGeodeWeb-Back

{opengeodeweb_back-6.5.1 → opengeodeweb_back-6.5.2}/src/opengeodeweb_back/app.py

@@ -23,12 +23,6 @@ def create_app(name: str) -> flask.Flask:
     )
     if FLASK_DEBUG == False:
         app.config.from_object(app_config.ProdConfig)
-        SECONDS_BETWEEN_SHUTDOWNS: float = float(
-            app.config.get("SECONDS_BETWEEN_SHUTDOWNS") or 60.0
-        )
-        utils_functions.set_interval(
-            utils_functions.kill_task, SECONDS_BETWEEN_SHUTDOWNS, app
-        )
     else:
         app.config.from_object(app_config.DevConfig)
 
@@ -64,6 +58,15 @@ def create_app(name: str) -> flask.Flask:
         flask.abort(500, f"Test")
         return flask.make_response({}, 500)
 
+    @app.route(
+        "/health",
+        methods=["GET"],
+    )
+    def health() -> Response:
+        if utils_functions.kill_task(flask.current_app):
+            return flask.make_response({}, 500)
+        return flask.make_response({}, 200)
+
     @app.route("/", methods=["POST"])
     @cross_origin()
     def root() -> Response:
@@ -132,6 +135,7 @@ def run_server(app: Flask) -> None:
     parser.add_argument(
         "-origins",
         "--allowed_origins",
+        nargs="+",
         default=app.config.get("ORIGINS"),
         help="Origins that are allowed to connect to the server",
     )
@@ -141,7 +145,7 @@ def run_server(app: Flask) -> None:
         default=app.config.get("MINUTES_BEFORE_TIMEOUT"),
         help="Number of minutes before the server times out",
     )
-    args = parser.parse_args()
+    args, _ = parser.parse_known_args()
     app.config.update(DATA_FOLDER_PATH=args.data_folder_path)
     app.config.update(
         EXTENSIONS_FOLDER_PATH=os.path.join(str(args.data_folder_path), "extensions")

{opengeodeweb_back-6.5.1 → opengeodeweb_back-6.5.2}/src/opengeodeweb_back/utils_functions.py

@@ -78,7 +78,7 @@ def teardown_request(
         print(message, flush=True)
 
 
-def kill_task(current_app: flask.Flask) -> None:
+def kill_task(current_app: flask.Flask) -> bool:
     REQUEST_COUNTER = int(current_app.config.get("REQUEST_COUNTER", 0))
     LAST_PING_TIME = float(current_app.config.get("LAST_PING_TIME", 0))
     LAST_REQUEST_TIME = float(current_app.config.get("LAST_REQUEST_TIME", 0))
@@ -86,15 +86,23 @@ def kill_task(current_app: flask.Flask) -> None:
     current_time = time.time()
     minutes_since_last_request = (current_time - LAST_REQUEST_TIME) / 60
     minutes_since_last_ping = (current_time - LAST_PING_TIME) / 60
-
-    if REQUEST_COUNTER > 0:
-        return
+    print(
+        "kill_task",
+        REQUEST_COUNTER,
+        MINUTES_BEFORE_TIMEOUT,
+        minutes_since_last_ping,
+        minutes_since_last_request,
+        flush=True,
+    )
+    if REQUEST_COUNTER > 1:
+        return False
     if MINUTES_BEFORE_TIMEOUT == 0:
-        return
+        return False
     if minutes_since_last_ping > MINUTES_BEFORE_TIMEOUT:
-        kill_server()
+        return True
     if minutes_since_last_request > MINUTES_BEFORE_TIMEOUT:
-        kill_server()
+        return True
+    return False
 
 
 def kill_server() -> None: