particle-os/debian-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

monitor: convert to json-seq

Browse source 
Tweak the existing json progress to follow the `application/json-seq`
media type as outlined in rfc7464 [0],[1].

[0] https://datatracker.ietf.org/doc/html/rfc7464
[1] https://en.wikipedia.org/wiki/JSON_streaming#Record_separator-delimited_JSON:wqu
This commit is contained in:
Michael Vogt 2023-11-15 17:36:52 +01:00 • committed by Ondřej Budai
parent 83dc625fc3
commit c6eaac278d
3 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/mod/test_monitor.py
View file

@ -13,7 +13,7 @@ from collections import defaultdict
import osbuild
import osbuild.meta
from osbuild.monitor import LogMonitor
from osbuild.monitor import JSONProgressMonitor, Context, Progress, LogLine
from osbuild.monitor import JSONSeqMonitor, Context, Progress, LogLine
from osbuild.objectstore import ObjectStore
from osbuild.pipeline import Runner
@ -195,7 +195,7 @@ def test_json_progress_monitor():
manifest.add_pipeline(pl2, "", "")
with tempfile.TemporaryFile() as tf:
mon = JSONProgressMonitor(tf.fileno(), manifest)
mon = JSONSeqMonitor(tf.fileno(), manifest)
mon.log("test-message-1")
mon.log("test-message-2", origin="test.origin.override")
mon.begin(manifest.pipelines["test-pipeline-first"])
@ -208,7 +208,7 @@ def test_json_progress_monitor():
mon.log("pipeline 2 message 2")
tf.seek(0)
log = tf.read().decode().strip().split("\n")
log = tf.read().decode().strip().split(u"\x1e")
assert len(log) == 7
logitem = json.loads(log[0])