From: Olga Arkhangelskaia <arkholga@tarantool.org> To: tarantool-patches@freelists.org Cc: Olga Arkhangelskaia <arkholga@tarantool.org> Subject: [tarantool-patches] [PATCH v3 3/4] box-tap: syslog destination test unix socket Date: Tue, 24 Jul 2018 20:11:51 +0300 [thread overview] Message-ID: <20180724171152.24921-4-arkholga@tarantool.org> (raw) In-Reply-To: <20180724171152.24921-1-arkholga@tarantool.org> Adds syslog destination unix test in box-tap. Test redirects logs to newly created unix socket and sets appropriate log level. If log receives the same level - test passes. In case if syslog is not configured we use pcall. Closes #3487 --- test/box-tap/cfg.test.lua | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua index 67e4c3af9..d1e595b1c 100755 --- a/test/box-tap/cfg.test.lua +++ b/test/box-tap/cfg.test.lua @@ -6,7 +6,7 @@ local socket = require('socket') local fio = require('fio') local uuid = require('uuid') local msgpack = require('msgpack') -test:plan(96) +test:plan(97) -------------------------------------------------------------------------------- -- Invalid values @@ -472,5 +472,40 @@ code = [[pcall(box.cfg, {log = 'syslog:identity=tarantool'}) ]] test:is(run_script(code), 0, "syslog log configuration") +-- +-- Check syslog socket configuration +-- +code = [[ +local tap = require('tap') +local socket = require('socket') +local os = require('os') +local test = tap.test("syslog_unix") +local log = require('log') +local fio = require('fio') + +path = fio.pathjoin(fio.cwd(), 'log_unix_socket_test.sock') +unix_socket = socket('AF_UNIX', 'SOCK_DGRAM',0) +unix_socket:bind('unix/', path) +socket.tcp_connect('unix', path) + +opt = string.format("syslog:server=unix:%s,identity=tarantool", path) +res = 1 +if pcall (box.cfg, {log = opt, log_level = 5}) then + log.info("Test socket syslog destination") + buf = unix_socket:read("Test socket syslog destination", 30) + if buf ~= nil then + if buf:match('Test socket syslog destination') then res = 0 + else res = 1 end + else + res = 1 + end +end + +unix_socket:close() +os.remove(path) +os.exit(res) +]] +test:is(run_script(code), 0, "unix socket syslog log configuration") + test:check() os.exit(0) -- 2.14.3 (Apple Git-98)
next prev parent reply other threads:[~2018-07-24 17:12 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-24 17:11 [tarantool-patches] [PATCH v3 0/4] Syslog destination Olga Arkhangelskaia 2018-07-24 17:11 ` [tarantool-patches] [PATCH v3 1/4] Configurable syslog destination Olga Arkhangelskaia 2018-07-25 16:27 ` Vladimir Davydov 2018-07-24 17:11 ` [tarantool-patches] [PATCH v3 2/4] box-tap: test valid log configuration Olga Arkhangelskaia 2018-07-24 17:11 ` Olga Arkhangelskaia [this message] 2018-07-25 16:40 ` [tarantool-patches] [PATCH v3 3/4] box-tap: syslog destination test unix socket Vladimir Davydov 2018-07-24 17:11 ` [tarantool-patches] [PATCH v3 4/4] box-tap:syslog remote destination test Olga Arkhangelskaia 2018-07-25 16:43 ` Vladimir Davydov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180724171152.24921-4-arkholga@tarantool.org \ --to=arkholga@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v3 3/4] box-tap: syslog destination test unix socket' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox