mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 14:30:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'status_at_end' into 'master'

Browse source 
Also write status.json when command finished

See merge request fdroid/fdroidserver!1172
This commit is contained in:
Hans-Christoph Steiner 2022-08-25 08:54:07 +00:00
commit 271e0ab232
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
fdroidserver/common.py
View file

@ -900,13 +900,17 @@ def write_status_json(output, pretty=False, name=None):
os.makedirs(status_dir)
if not name:
output['endTimestamp'] = int(datetime.now(timezone.utc).timestamp() * 1000)
name = sys.argv[0].split()[1] # fdroid subcommand
path = os.path.join(status_dir, name + '.json')
with open(path, 'w') as fp:
if pretty:
json.dump(output, fp, sort_keys=True, cls=Encoder, indent=2)
else:
json.dump(output, fp, sort_keys=True, cls=Encoder, separators=(',', ':'))
names = ['running', sys.argv[0].split()[1]] # fdroid subcommand
else:
names = [name]
for fname in names:
path = os.path.join(status_dir, fname + '.json')
with open(path, "w", encoding="utf-8") as fp:
if pretty:
json.dump(output, fp, sort_keys=True, cls=Encoder, indent=2)
else:
json.dump(output, fp, sort_keys=True, cls=Encoder, separators=(',', ':'))
rsync_status_file_to_repo(path, repo_subdir='status')