From b9ea47c258dfeb55552001c88e4d31e1678e6575 Mon Sep 17 00:00:00 2001
From: Rolf Niepraschk <Rolf.Niepraschk@ptb.de>
Date: Thu, 12 Nov 2020 13:12:35 +0100
Subject: [PATCH] version url added ("/version")
---
server.py | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/server.py b/server.py
index 0a5d8dc..75ba294 100644
--- a/server.py
+++ b/server.py
@@ -4,15 +4,17 @@ from flask_cors import CORS
from urllib.parse import urlparse
import sys, requests
-app = Flask(__name__)
+app = Flask(__name__)
+
+VERSION = '1.0.0'
+
+COUCHDB_PROTO = 'http'
+COUCHDB_PORT = '5984'
FLASK_RUN_PORT = sys.argv[1]
DATA_PATH = sys.argv[2]
FLASK_ENV = sys.argv[3]
FLASK_DEBUG = sys.argv[4]
-COUCHDB_PROTO = 'http'
-COUCHDB_PORT = '5984'
-DB = 'vl_db'
app = Flask(__name__, static_url_path='')
app.url_map.strict_slashes = False
@@ -28,7 +30,7 @@ def x(p1, p2=''):
path = p1
if p2:
path = path + '/' + p2
- app.logger.debug('hit path: ' + path)
+ app.logger.debug('[path] ' + path)
return send_from_directory(DATA_PATH, path)
'''
@@ -49,10 +51,9 @@ https://stackoverflow.com/questions/6656363/proxying-to-another-web-service-with
methods=['GET','PUT','POST','HEAD','DELETE','OPTIONS'])
def couchdb_proxy(p=''):
q = request.query_string.decode();
+ path = p
if q:
path = p + '?' + q
- else:
- path = p
host = urlparse(request.base_url).hostname
new_url = '{}://{}:{}/{}'.format(COUCHDB_PROTO, host, COUCHDB_PORT, path)
app.logger.debug('[old couchdb url] ' + request.url)
@@ -71,6 +72,10 @@ def couchdb_proxy(p=''):
response = Response(resp.content, resp.status_code, headers)
return response
+@app.route('/version')
+def version():
+ return VERSION + '\n'
+
if __name__ == '__main__':
app.config['ENV'] = FLASK_ENV
app.config['DEBUG'] = FLASK_DEBUG
--
GitLab