Skip to content

Commit 4642c78

Browse files
committed
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Back into fix/database
2 parents 7e74940 + 118f00d commit 4642c78

File tree

6 files changed

+55
-14
lines changed

6 files changed

+55
-14
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ __pycache__
99
.vscode
1010
uploads
1111
node_modules
12-
schemas.json
1312
.mypy_cache
1413
*.db
14+
opengeodeweb_back_schemas.json

package-lock.json

Lines changed: 14 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

requirements.new

Whitespace-only changes.

requirements.txt

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
#
55
# pip-compile --output-file=./requirements.txt ./requirements.in
66
#
7-
asgiref==3.10.0
7+
asgiref>=3.10
88
# via flask
9-
blinker==1.9.0
9+
blinker>=1.9
1010
# via flask
11-
click==8.3.0
11+
click>=8.3
1212
# via flask
13-
flask[async]==3.1.2
13+
flask[async]>=3.1
1414
# via
1515
# -r requirements.in
1616
# flask-cors
@@ -25,13 +25,13 @@ geode-common==33.11.0
2525
# geode-viewables
2626
geode-viewables==3.3.0
2727
# via -r requirements.in
28-
greenlet==3.2.4
28+
greenlet>=3.2
2929
# via sqlalchemy
30-
itsdangerous==2.2.0
30+
itsdangerous>=2.2
3131
# via flask
32-
jinja2==3.1.6
32+
jinja2>=3.1
3333
# via flask
34-
markupsafe==3.0.3
34+
markupsafe>=3.0
3535
# via
3636
# flask
3737
# jinja2
@@ -59,9 +59,14 @@ opengeode-io==7.4.0
5959
# -r requirements.in
6060
# geode-viewables
6161
# opengeode-geosciencesio
62-
sqlalchemy==2.0.43
62+
sqlalchemy>=2.0
6363
# via flask-sqlalchemy
64-
typing-extensions==4.15.0
64+
typing-extensions>=4.15
6565
# via sqlalchemy
6666
werkzeug==3.1.2
67-
flask-sqlalchemy==3.1.1
67+
# via
68+
# -r requirements.in
69+
# flask
70+
# flask-cors
71+
72+
opengeodeweb-microservice==1.*,>=1.0.4rc5

src/opengeodeweb_back/routes/blueprint_routes.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -381,3 +381,17 @@ def ping():
381381
utils_functions.validate_request(flask.request, ping_json)
382382
flask.current_app.config.update(LAST_PING_TIME=time.time())
383383
return flask.make_response({"message": "Flask server is running"}, 200)
384+
385+
386+
with open(
387+
os.path.join(schemas, "kill.json"),
388+
"r",
389+
) as file:
390+
kill_json = json.load(file)
391+
392+
393+
@routes.route(kill_json["route"], methods=kill_json["methods"])
394+
def kill() -> flask.Response:
395+
print("Manual server kill, shutting down...", flush=True)
396+
os._exit(0)
397+
return flask.make_response({"message": "Flask server is dead"}, 200)
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"route": "/kill",
3+
"methods": [
4+
"POST"
5+
],
6+
"type": "object",
7+
"properties": {},
8+
"required": [],
9+
"additionalProperties": false
10+
}

0 commit comments

Comments
 (0)