Merge pull request #1937 from evverx/fix-stdout-parsing
Fix stdout stream parsing
This commit is contained in:
commit
d353a16d1f
|
@ -5680,6 +5680,9 @@ EXTRA_DIST += \
|
||||||
test/TEST-03-JOBS/Makefile \
|
test/TEST-03-JOBS/Makefile \
|
||||||
test/TEST-03-JOBS/test-jobs.sh \
|
test/TEST-03-JOBS/test-jobs.sh \
|
||||||
test/TEST-03-JOBS/test.sh \
|
test/TEST-03-JOBS/test.sh \
|
||||||
|
test/TEST-04-JOURNAL/Makefile \
|
||||||
|
test/TEST-04-JOURNAL/test-journal.sh \
|
||||||
|
test/TEST-04-JOURNAL/test.sh \
|
||||||
test/test-functions
|
test/test-functions
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
|
|
|
@ -239,14 +239,14 @@ static int stdout_stream_log(StdoutStream *s, const char *p) {
|
||||||
assert(s);
|
assert(s);
|
||||||
assert(p);
|
assert(p);
|
||||||
|
|
||||||
if (isempty(p))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
priority = s->priority;
|
priority = s->priority;
|
||||||
|
|
||||||
if (s->level_prefix)
|
if (s->level_prefix)
|
||||||
syslog_parse_priority(&p, &priority, false);
|
syslog_parse_priority(&p, &priority, false);
|
||||||
|
|
||||||
|
if (isempty(p))
|
||||||
|
return 0;
|
||||||
|
|
||||||
if (s->forward_to_syslog || s->server->forward_to_syslog)
|
if (s->forward_to_syslog || s->server->forward_to_syslog)
|
||||||
server_forward_syslog(s->server, syslog_fixup_facility(priority), s->identifier, p, &s->ucred, NULL);
|
server_forward_syslog(s->server, syslog_fixup_facility(priority), s->identifier, p, &s->ucred, NULL);
|
||||||
|
|
||||||
|
@ -286,10 +286,12 @@ static int stdout_stream_log(StdoutStream *s, const char *p) {
|
||||||
|
|
||||||
static int stdout_stream_line(StdoutStream *s, char *p) {
|
static int stdout_stream_line(StdoutStream *s, char *p) {
|
||||||
int r;
|
int r;
|
||||||
|
char *orig;
|
||||||
|
|
||||||
assert(s);
|
assert(s);
|
||||||
assert(p);
|
assert(p);
|
||||||
|
|
||||||
|
orig = p;
|
||||||
p = strstrip(p);
|
p = strstrip(p);
|
||||||
|
|
||||||
switch (s->state) {
|
switch (s->state) {
|
||||||
|
@ -378,7 +380,7 @@ static int stdout_stream_line(StdoutStream *s, char *p) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
case STDOUT_STREAM_RUNNING:
|
case STDOUT_STREAM_RUNNING:
|
||||||
return stdout_stream_log(s, p);
|
return stdout_stream_log(s, orig);
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_not_reached("Unknown stream state");
|
assert_not_reached("Unknown stream state");
|
||||||
|
|
1
test/TEST-04-JOURNAL/Makefile
Symbolic link
1
test/TEST-04-JOURNAL/Makefile
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../TEST-01-BASIC/Makefile
|
55
test/TEST-04-JOURNAL/test-journal.sh
Executable file
55
test/TEST-04-JOURNAL/test-journal.sh
Executable file
|
@ -0,0 +1,55 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -x
|
||||||
|
set -e
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
# Test stdout stream
|
||||||
|
|
||||||
|
# Skip empty lines
|
||||||
|
ID=$(journalctl --new-id128 | sed -n 2p)
|
||||||
|
>/expected
|
||||||
|
printf $'\n\n\n' | systemd-cat -t "$ID" --level-prefix false
|
||||||
|
journalctl --flush
|
||||||
|
journalctl -b -o cat -t "$ID" >/output
|
||||||
|
cmp /expected /output
|
||||||
|
|
||||||
|
ID=$(journalctl --new-id128 | sed -n 2p)
|
||||||
|
>/expected
|
||||||
|
printf $'<5>\n<6>\n<7>\n' | systemd-cat -t "$ID" --level-prefix true
|
||||||
|
journalctl --flush
|
||||||
|
journalctl -b -o cat -t "$ID" >/output
|
||||||
|
cmp /expected /output
|
||||||
|
|
||||||
|
# Remove trailing spaces
|
||||||
|
ID=$(journalctl --new-id128 | sed -n 2p)
|
||||||
|
printf "Trailing spaces\n">/expected
|
||||||
|
printf $'<5>Trailing spaces \t \n' | systemd-cat -t "$ID" --level-prefix true
|
||||||
|
journalctl --flush
|
||||||
|
journalctl -b -o cat -t "$ID" >/output
|
||||||
|
cmp /expected /output
|
||||||
|
|
||||||
|
ID=$(journalctl --new-id128 | sed -n 2p)
|
||||||
|
printf "Trailing spaces\n">/expected
|
||||||
|
printf $'Trailing spaces \t \n' | systemd-cat -t "$ID" --level-prefix false
|
||||||
|
journalctl --flush
|
||||||
|
journalctl -b -o cat -t "$ID" >/output
|
||||||
|
cmp /expected /output
|
||||||
|
|
||||||
|
# Don't remove leading spaces
|
||||||
|
ID=$(journalctl --new-id128 | sed -n 2p)
|
||||||
|
printf $' \t Leading spaces\n'>/expected
|
||||||
|
printf $'<5> \t Leading spaces\n' | systemd-cat -t "$ID" --level-prefix true
|
||||||
|
journalctl --flush
|
||||||
|
journalctl -b -o cat -t "$ID" >/output
|
||||||
|
cmp /expected /output
|
||||||
|
|
||||||
|
ID=$(journalctl --new-id128 | sed -n 2p)
|
||||||
|
printf $' \t Leading spaces\n'>/expected
|
||||||
|
printf $' \t Leading spaces\n' | systemd-cat -t "$ID" --level-prefix false
|
||||||
|
journalctl --flush
|
||||||
|
journalctl -b -o cat -t "$ID" >/output
|
||||||
|
cmp /expected /output
|
||||||
|
|
||||||
|
touch /testok
|
||||||
|
exit 0
|
76
test/TEST-04-JOURNAL/test.sh
Executable file
76
test/TEST-04-JOURNAL/test.sh
Executable file
|
@ -0,0 +1,76 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||||
|
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||||
|
TEST_DESCRIPTION="Journal-related tests"
|
||||||
|
|
||||||
|
. $TEST_BASE_DIR/test-functions
|
||||||
|
|
||||||
|
check_result_qemu() {
|
||||||
|
ret=1
|
||||||
|
mkdir -p $TESTDIR/root
|
||||||
|
mount ${LOOPDEV}p1 $TESTDIR/root
|
||||||
|
[[ -e $TESTDIR/root/testok ]] && ret=0
|
||||||
|
[[ -f $TESTDIR/root/failed ]] && cp -a $TESTDIR/root/failed $TESTDIR
|
||||||
|
cp -a $TESTDIR/root/var/log/journal $TESTDIR
|
||||||
|
umount $TESTDIR/root
|
||||||
|
[[ -f $TESTDIR/failed ]] && cat $TESTDIR/failed
|
||||||
|
ls -l $TESTDIR/journal/*/*.journal
|
||||||
|
test -s $TESTDIR/failed && ret=$(($ret+1))
|
||||||
|
return $ret
|
||||||
|
}
|
||||||
|
|
||||||
|
test_run() {
|
||||||
|
if run_qemu; then
|
||||||
|
check_result_qemu || return 1
|
||||||
|
else
|
||||||
|
dwarn "can't run QEMU, skipping"
|
||||||
|
fi
|
||||||
|
if check_nspawn; then
|
||||||
|
run_nspawn
|
||||||
|
check_result_nspawn || return 1
|
||||||
|
else
|
||||||
|
dwarn "can't run systemd-nspawn, skipping"
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
test_setup() {
|
||||||
|
create_empty_image
|
||||||
|
mkdir -p $TESTDIR/root
|
||||||
|
mount ${LOOPDEV}p1 $TESTDIR/root
|
||||||
|
|
||||||
|
# Create what will eventually be our root filesystem onto an overlay
|
||||||
|
(
|
||||||
|
LOG_LEVEL=5
|
||||||
|
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
|
||||||
|
|
||||||
|
setup_basic_environment
|
||||||
|
|
||||||
|
# setup the testsuite service
|
||||||
|
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
|
||||||
|
[Unit]
|
||||||
|
Description=Testsuite service
|
||||||
|
After=multi-user.target
|
||||||
|
|
||||||
|
[Service]
|
||||||
|
ExecStart=/test-journal.sh
|
||||||
|
Type=oneshot
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cp test-journal.sh $initdir/
|
||||||
|
|
||||||
|
setup_testsuite
|
||||||
|
)
|
||||||
|
setup_nspawn_root
|
||||||
|
|
||||||
|
ddebug "umount $TESTDIR/root"
|
||||||
|
umount $TESTDIR/root
|
||||||
|
}
|
||||||
|
|
||||||
|
test_cleanup() {
|
||||||
|
umount $TESTDIR/root 2>/dev/null
|
||||||
|
[[ $LOOPDEV ]] && losetup -d $LOOPDEV
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
do_test "$@"
|
|
@ -13,7 +13,7 @@ if ! ROOTLIBDIR=$(pkg-config --variable=systemdutildir systemd); then
|
||||||
ROOTLIBDIR=/usr/lib/systemd
|
ROOTLIBDIR=/usr/lib/systemd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BASICTOOLS="sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe"
|
BASICTOOLS="sh bash setsid loadkeys setfont login sulogin gzip sleep echo mount umount cryptsetup date dmsetup modprobe sed cmp tee"
|
||||||
DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort hostname"
|
DEBUGTOOLS="df free ls stty cat ps ln ip route dmesg dhclient mkdir cp ping dhclient strace less grep id tty touch du sort hostname"
|
||||||
|
|
||||||
function find_qemu_bin() {
|
function find_qemu_bin() {
|
||||||
|
|
Loading…
Reference in a new issue