Skip to content
Snippets Groups Projects
Commit 9a9c52b8 authored by Rolf Niepraschk's avatar Rolf Niepraschk
Browse files

"version" and "update" modified

parent 8cb88937
Branches
Tags 0.1.29
No related merge requests found
...@@ -45,16 +45,14 @@ def append_cert(year_cert): ...@@ -45,16 +45,14 @@ def append_cert(year_cert):
def main(): def main():
return utils.return_error('Cert ID missing') return utils.return_error('Cert ID missing')
@app.route('/update', methods=['post']) @app.route('/update', methods=['POST'])
def update(): def update():
app.logger.debug('hit update') app.logger.debug('hit update')
req = request.get_json() req = request.get_json()
#pprint(req) ###pprint(req)
tarball_url = req['repository']['homepage'] + '/-/archive/master/' + \ tarball_url = req['repository']['homepage'] + '/-/archive/master/' + \
req['repository']['name'] + '-master.tar' req['repository']['name'] + '-master.tar'
version = req['ref'].split('/')[2] + '-' + req['checkout_sha'] version = str(utils.get_version())
with open('./VERSION', 'w') as f: # TODO: anderes Verfahren
print(version, file=f)
with open('./LOG', 'a') as f: with open('./LOG', 'a') as f:
print(datetime.now().strftime("[%Y-%m-%d %H:%M:%S] " + version), file=f) print(datetime.now().strftime("[%Y-%m-%d %H:%M:%S] " + version), file=f)
try: try:
...@@ -63,20 +61,20 @@ def update(): ...@@ -63,20 +61,20 @@ def update():
output = subprocess.check_output(('/usr/bin/tar', '--extract', \ output = subprocess.check_output(('/usr/bin/tar', '--extract', \
'-f', '-', '--strip-components=1'), stdin=ps.stdout) '-f', '-', '--strip-components=1'), stdin=ps.stdout)
ps.wait() ps.wait()
except: except Exception as error:
app.logger.debug(str(error)) app.logger.debug(str(error))
return jsonify({'error':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(): def version():
app.logger.debug('hit version') app.logger.debug('hit version')
version = utils.get_version() version = utils.get_version()
if version: if version:
return jsonify({'version':version}) return jsonify({'version':version})
else: else:
return utils.return_error('Version unknown') return jsonify({'error':'Version unknown'})
if __name__ == '__main__': if __name__ == '__main__':
app.run(host=config['server']['host'], port=config['server']['port']) app.run(host=config['server']['host'], port=config['server']['port'])
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment