From: Vladimir Davydov <vdavydov.dev@gmail.com> To: Olga Arkhangelskaia <arkholga@tarantool.org> Cc: tarantool-patches@freelists.org Subject: Re: [tarantool-patches] [PATCH v4 4/4] box-tap:syslog remote destination test Date: Tue, 31 Jul 2018 16:57:51 +0300 [thread overview] Message-ID: <20180731135751.qa76tpmbpvatt3xq@esperanza> (raw) In-Reply-To: <20180731101833.55671-5-arkholga@tarantool.org> On Tue, Jul 31, 2018 at 01:18:33PM +0300, Olga Arkhangelskaia wrote: > Adds syslog remote destination test in box-tap. > Test creates server, sets appropriate log level and redirects logs > to it. If log level received by the server is the same - test passes. > If syslogd is not running we use pcall. > > Closes #3487 > --- > test/box-tap/cfg.test.lua | 38 +++++++++++++++++++++++++++++++++++++- > 1 file changed, 37 insertions(+), 1 deletion(-) > > diff --git a/test/box-tap/cfg.test.lua b/test/box-tap/cfg.test.lua > index 2b1769395..34a6eaa66 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(97) > +test:plan(98) > > -------------------------------------------------------------------------------- > -- Invalid values > @@ -499,5 +499,41 @@ os.exit(res) > ]] > test:is(run_script(code), 0, "unix socket syslog log configuration") > > +-- > +-- Check syslog remote configuration > +-- > +code = [[ > +local socket = require('socket') > +local log = require('log') > + > +addr = '127.0.0.1' > +port = 1000 + math.random(32768) > + > +sc = socket('AF_INET', 'SOCK_DGRAM', 'udp') > +local attempt = 0 > +while attempt < 10 do > + if not sc:bind (addr, port) then > + port = 1000 + math.random(32768) > + attempt = attempt + 1 > + else > + break A tab instead of spaces. Please fix indentation. > + end > +end > +sc:bind(addr, port) > + > +local opt = string.format("syslog:server=%s:%u,identity=tarantool", addr, port) > +local res = 1 > +box.cfg{log = opt, log_level = 5} > +log.info('Test syslog destination') > +while (sc:readable(1)) do The parentheses are redundant. > + buf = sc:recv(1000) I think that a message can get split (at least, theoretically). Shouldn't you append the result to the buffer instead: buf = buf .. sc:recv(1000) > + if buf:match('Test syslog destination') then res = 0 end > +end > + > +sc:close() > +os.exit(res) > +]] > +test:is(run_script(code), 0, "remote syslog log configuration") > + > test:check() > os.exit(0)
prev parent reply other threads:[~2018-07-31 13:57 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-07-31 10:18 [tarantool-patches] [PATCH v4 0/4] Syslog destination Olga Arkhangelskaia 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 1/4] Configurable syslog destination Olga Arkhangelskaia 2018-07-31 12:45 ` Vladimir Davydov 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 2/4] box-tap: test valid log configuration Olga Arkhangelskaia 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 3/4] box-tap: syslog destination test unix socket Olga Arkhangelskaia 2018-07-31 13:55 ` Vladimir Davydov 2018-07-31 10:18 ` [tarantool-patches] [PATCH v4 4/4] box-tap:syslog remote destination test Olga Arkhangelskaia 2018-07-31 13:57 ` Vladimir Davydov [this message]
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=20180731135751.qa76tpmbpvatt3xq@esperanza \ --to=vdavydov.dev@gmail.com \ --cc=arkholga@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v4 4/4] box-tap:syslog remote destination test' \ /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