AT_CHECK([$PYTHON $srcdir/test-vlog.py --log-file log_file \
-v dbg module_1:info module_2:warn syslog:off 2>stderr_log])
-AT_CHECK([diff log_file stderr_log])
-
-AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z|//' \
+AT_CHECK([sed -e 's/.*-.*-.*T..:..:..Z |//' \
-e 's/File ".*", line [[0-9]][[0-9]]*,/File <name>, line <number>,/' \
stderr_log], [0], [dnl
-0|module_0|EMER|emergency
-1|module_0|ERR|error
-2|module_0|WARN|warning
-3|module_0|INFO|information
-4|module_0|DBG|debug
-5|module_0|EMER|emergency exception
+ 0 | module_0 | EMER | emergency
+ 1 | module_0 | ERR | error
+ 2 | module_0 | WARN | warning
+ 3 | module_0 | INFO | information
+ 4 | module_0 | DBG | debug
+ 5 | module_0 | EMER | emergency exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-6|module_0|ERR|error exception
+ 6 | module_0 | ERR | error exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-7|module_0|WARN|warn exception
+ 7 | module_0 | WARN | warn exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-8|module_0|INFO|information exception
+ 8 | module_0 | INFO | information exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-9|module_0|DBG|debug exception
+ 9 | module_0 | DBG | debug exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-10|module_0|ERR|exception
+ 10 | module_0 | ERR | exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-11|module_1|EMER|emergency
-12|module_1|ERR|error
-13|module_1|WARN|warning
-14|module_1|INFO|information
-16|module_1|EMER|emergency exception
+ 11 | module_1 | EMER | emergency
+ 12 | module_1 | ERR | error
+ 13 | module_1 | WARN | warning
+ 14 | module_1 | INFO | information
+ 16 | module_1 | EMER | emergency exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-17|module_1|ERR|error exception
+ 17 | module_1 | ERR | error exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-18|module_1|WARN|warn exception
+ 18 | module_1 | WARN | warn exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-19|module_1|INFO|information exception
+ 19 | module_1 | INFO | information exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-21|module_1|ERR|exception
+ 21 | module_1 | ERR | exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-22|module_2|EMER|emergency
-23|module_2|ERR|error
-24|module_2|WARN|warning
-27|module_2|EMER|emergency exception
+ 22 | module_2 | EMER | emergency
+ 23 | module_2 | ERR | error
+ 24 | module_2 | WARN | warning
+ 27 | module_2 | EMER | emergency exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-28|module_2|ERR|error exception
+ 28 | module_2 | ERR | error exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-29|module_2|WARN|warn exception
+ 29 | module_2 | WARN | warn exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AssertionError
-32|module_2|ERR|exception
+ 32 | module_2 | ERR | exception
Traceback (most recent call last):
File <name>, line <number>, in main
assert fail
AT_SETUP([vlog - vlog/reopen - Python])
AT_SKIP_IF([test $HAVE_PYTHON = no])
-OVS_RUNDIR=`pwd`; export OVS_RUNDIR
-OVS_LOGDIR=`pwd`; export OVS_LOGDIR
-OVS_DBDIR=`pwd`; export OVS_DBDIR
-OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
-ON_EXIT([kill `cat test-unixctl.py.pid`])
+on_exit 'kill `cat test-unixctl.py.pid`'
AT_CAPTURE_FILE([log])
AT_CAPTURE_FILE([log.old])
AT_CHECK([APPCTL -t test-unixctl.py exit])
AT_CHECK([sed 's/.*|//' log.old], [0], [dnl
-Entering run loop.
-message
-message2
+ Entering run loop.
+ message
+ message2
])
AT_CHECK([sed 's/.*|//' log], [0], [dnl
-message3
+ message3
])
AT_CLEANUP
AT_SETUP([vlog - vlog/reopen without log file - Python])
AT_SKIP_IF([test $HAVE_PYTHON = no])
-OVS_RUNDIR=`pwd`; export OVS_RUNDIR
-OVS_LOGDIR=`pwd`; export OVS_LOGDIR
-OVS_DBDIR=`pwd`; export OVS_DBDIR
-OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
-ON_EXIT([kill `cat test-unixctl.py.pid`])
+on_exit 'kill `cat test-unixctl.py.pid`'
AT_CHECK([$PYTHON $srcdir/test-unixctl.py --pidfile --detach])
AT_SKIP_IF([test ! -c /dev/full])
AT_SKIP_IF([echo > /dev/full])
-OVS_RUNDIR=`pwd`; export OVS_RUNDIR
-OVS_LOGDIR=`pwd`; export OVS_LOGDIR
-OVS_DBDIR=`pwd`; export OVS_DBDIR
-OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
-ON_EXIT([kill `cat test-unixctl.py.pid`])
+on_exit 'kill `cat test-unixctl.py.pid`'
AT_CHECK([$PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile --detach])
AT_CHECK([APPCTL -t test-unixctl.py log message])
AT_CHECK([APPCTL -t test-unixctl.py log message3])
AT_CHECK([APPCTL -t test-unixctl.py exit])
AT_CHECK([sed 's/.*|//' log.old], [0], [dnl
-Entering run loop.
-message
+ Entering run loop.
+ message
])
AT_CHECK([sed 's/.*|//' log], [0], [dnl
-message3
+ message3
])
AT_CLEANUP
AT_SETUP([vlog - vlog/set and vlog/list - Python])
AT_SKIP_IF([test $HAVE_PYTHON = no])
-OVS_RUNDIR=`pwd`; export OVS_RUNDIR
-OVS_LOGDIR=`pwd`; export OVS_LOGDIR
-OVS_DBDIR=`pwd`; export OVS_DBDIR
-OVS_SYSCONFDIR=`pwd`; export OVS_SYSCONFDIR
-ON_EXIT([kill `cat test-unixctl.py.pid`])
+on_exit 'kill `cat test-unixctl.py.pid`'
AT_CAPTURE_FILE([log])
AT_CHECK([$PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile --detach])
AT_CHECK([APPCTL -t test-unixctl.py vlog/set daemon:syslog:err])
AT_CHECK([APPCTL -t test-unixctl.py vlog/set file:dbg])
AT_CHECK([APPCTL -t test-unixctl.py vlog/set nonexistent], [0],
- [no facility, level, or module "nonexistent"
+ [no destination, level, or module "nonexistent"
])
AT_CHECK([APPCTL -t test-unixctl.py vlog/list], [0], [dnl
console syslog file
test-unixctl info info dbg
unixctl_server info info dbg
])
+
+AT_CHECK([APPCTL -t test-unixctl.py vlog/set pattern], [0],
+ [Please supply a valid pattern and destination
+])
+AT_CHECK([APPCTL -t test-unixctl.py vlog/set pattern:nonexistent], [0],
+ [Destination nonexistent does not exist
+])
+AT_CHECK([APPCTL -t test-unixctl.py vlog/set pattern:file:'I<3OVS|%m'])
+AT_CHECK([APPCTL -t test-unixctl.py log patterntest])
+AT_CHECK([grep -q 'I<3OVS' log])
+AT_CLEANUP
+
+AT_SETUP([vlog - RFC5424 facility])
+on_exit 'kill `cat ovsdb-server.pid`'
+
+dnl Create database.
+touch .conf.db.~lock~
+AT_CHECK([ovsdb-tool create conf.db $abs_top_srcdir/vswitchd/vswitch.ovsschema])
+
+AT_CHECK([ovsdb-server --detach --no-chdir --pidfile \
+ --remote=punix:$OVS_RUNDIR/db.sock -vPATTERN:file:"<%B>1 %A %m" \
+ --log-file], [0], [], [stderr])
+AT_CHECK([ovs-appctl -t ovsdb-server exit])
+
+# A default facility of LOG_LOCAL0 while writing to file.
+AT_CHECK([cat ovsdb-server.log | head -1 | awk '{print $1}'], [0], [<133>1
+])
+rm ovsdb-server.log
+
+AT_CHECK([ovsdb-server --detach --no-chdir --pidfile \
+ --remote=punix:$OVS_RUNDIR/db.sock -vPATTERN:file:"<%B>1 %A %m" \
+ -vFACILITY:daemon --log-file], [0], [], [stderr])
+
+AT_CHECK([cat ovsdb-server.log | head -1 | awk '{print $1}'], [0], [<29>1
+])
+
+AT_CHECK([ovs-appctl -t ovsdb-server vlog/set FACILITY:invalid], [2], [],
+[invalid facility
+ovs-appctl: ovsdb-server: server returned an error
+])
+
+AT_CHECK([ovs-appctl -t ovsdb-server vlog/set FACILITY:local7])
+AT_CHECK([ovs-appctl -t ovsdb-server vlog/set ANY:file:DBG])
+AT_CHECK([ovs-appctl -t ovsdb-server exit])
+
+AT_CHECK([cat ovsdb-server.log | tail -1 | awk '{print $1}'], [0], [<191>1
+])
+AT_CLEANUP
+
+AT_SETUP([vlog - RFC5424 facility - Python])
+AT_SKIP_IF([test $HAVE_PYTHON = no])
+on_exit 'kill `cat test-unixctl.py.pid`'
+
+AT_CHECK([$PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile \
+-vFACILITY:invalid --detach], [1], [], [test-unixctl.py: processing "FACILITY:invalid": Facility invalid is invalid
+])
+
+AT_CHECK([$PYTHON $srcdir/test-unixctl.py --log-file=`pwd`/log --pidfile \
+-vFACILITY:daemon --detach])
+
+AT_CHECK([ovs-appctl -t test-unixctl.py vlog/set FACILITY:invalid], [0],
+[Facility invalid is invalid
+])
+
+AT_CHECK([ovs-appctl -t test-unixctl.py vlog/set FACILITY:local0])
AT_CLEANUP