From 9a9c52b8a350d1a97c334179ad5532e1cf06b3a3 Mon Sep 17 00:00:00 2001 From: Rolf Niepraschk <Rolf.Niepraschk@ptb.de> Date: Tue, 18 Aug 2020 07:51:20 +0200 Subject: [PATCH] "version" and "update" modified --- server.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/server.py b/server.py index 02cdda4..7dceec4 100644 --- a/server.py +++ b/server.py @@ -45,16 +45,14 @@ def append_cert(year_cert): def main(): return utils.return_error('Cert ID missing') -@app.route('/update', methods=['post']) +@app.route('/update', methods=['POST']) def update(): app.logger.debug('hit update') req = request.get_json() - #pprint(req) + ###pprint(req) tarball_url = req['repository']['homepage'] + '/-/archive/master/' + \ req['repository']['name'] + '-master.tar' - version = req['ref'].split('/')[2] + '-' + req['checkout_sha'] - with open('./VERSION', 'w') as f: # TODO: anderes Verfahren - print(version, file=f) + version = str(utils.get_version()) with open('./LOG', 'a') as f: print(datetime.now().strftime("[%Y-%m-%d %H:%M:%S] " + version), file=f) try: @@ -63,20 +61,20 @@ def update(): output = subprocess.check_output(('/usr/bin/tar', '--extract', \ '-f', '-', '--strip-components=1'), stdin=ps.stdout) ps.wait() - except: - app.logger.debug(str(error)) + except Exception as error: + app.logger.debug(str(error)) return jsonify({'error':str(error)}) + + return jsonify({'OK':True}) - return jsonify({'ok':True}) - -@app.route('/version', methods=['get']) +@app.route('/version', methods=['GET']) def version(): app.logger.debug('hit version') version = utils.get_version() if version: return jsonify({'version':version}) else: - return utils.return_error('Version unknown') + return jsonify({'error':'Version unknown'}) if __name__ == '__main__': app.run(host=config['server']['host'], port=config['server']['port']) -- GitLab