From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id DB7C227334 for ; Tue, 31 Jul 2018 06:19:06 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4KWmX7rCrCE9 for ; Tue, 31 Jul 2018 06:19:06 -0400 (EDT) Received: from smtp57.i.mail.ru (smtp57.i.mail.ru [217.69.128.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 9BCE927276 for ; Tue, 31 Jul 2018 06:19:06 -0400 (EDT) From: Olga Arkhangelskaia Subject: [tarantool-patches] [PATCH v4 4/4] box-tap:syslog remote destination test Date: Tue, 31 Jul 2018 13:18:33 +0300 Message-Id: <20180731101833.55671-5-arkholga@tarantool.org> In-Reply-To: <20180731101833.55671-1-arkholga@tarantool.org> References: <20180731101833.55671-1-arkholga@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Olga Arkhangelskaia 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 + 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 + 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) -- 2.14.3 (Apple Git-98)