Commit 3924c539 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Minor fixes.

parent 397a607a
Pipeline #69257 canceled with stages
in 1 minute and 18 seconds
......@@ -395,6 +395,8 @@ def statistics_table(html, geometries, public_path):
+ get_statistic(data_all, 'system', 'molecule / cluster', 'calculations')
calculations_2d = get_statistic(data_all, 'system', '2D / surface', 'calculations')
calculations_2d += get_statistic(data_all, 'system', '2D', 'calculations')
calculations_2d += get_statistic(data_all, 'system', 'surface', 'calculations')
calculations_3d = get_statistic(data_all, 'system', 'bulk', 'calculations')
metrics_all = client.repo.search(per_page=1, metrics=[geometry_metric, 'quantities']).response().result
......@@ -421,8 +423,8 @@ def statistics_table(html, geometries, public_path):
out = process.stdout.decode('utf-8')
if process.stderr is not None:
err = process.stderr.decode('utf-8')
print('There is an error: %s' % str(err))
return out
print('There is an error: %s' % str(err.strip()))
return out.split('\t')[0].strip()
archive_data = run_shell_command((
'find %s -regex \'.*archive.*public.*zip\' '
......@@ -449,8 +451,8 @@ def statistics_table(html, geometries, public_path):
DOS: {:,.0f}
Band structures: {:,.0f}
Total parsed quantities: {:,.0f}
Public raw data: {}
Public archive data: {}
Public raw data: {}B
Public archive data: {}B
Number of uploads: {}
'''.format(
entries,
......
......@@ -16,7 +16,7 @@ data:
keys=console, access, error
[formatters]
keys=generic
keys=generic, json
[logger_root]
level=INFO
......@@ -38,14 +38,14 @@ data:
args=(sys.stdout, )
[handler_access]
class=logstash.TCPLogstashHandler
class=StreamHandler
formatter=json
args=('{{ .Values.logstash.host }}',{{ .Values.logstash.port }})
args=(sys.stdout, )
[handler_error]
class=logstash.TCPLogstashHandler
class=StreamHandler
formatter=json
args=('{{ .Values.logstash.host }}',{{ .Values.logstash.port }})
args=(sys.stdout, )
[formatter_generic]
format=%(asctime)s [%(process)d] [%(levelname)s] %(message)s
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment