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 0CDCE21B45 for ; Tue, 24 Jul 2018 13:12:12 -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 xNssEPRUD8IF for ; Tue, 24 Jul 2018 13:12:11 -0400 (EDT) Received: from smtp45.i.mail.ru (smtp45.i.mail.ru [94.100.177.105]) (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 94BA2227D4 for ; Tue, 24 Jul 2018 13:12:11 -0400 (EDT) From: Olga Arkhangelskaia Subject: [tarantool-patches] [PATCH v3 3/4] box-tap: syslog destination test unix socket Date: Tue, 24 Jul 2018 20:11:51 +0300 Message-Id: <20180724171152.24921-4-arkholga@tarantool.org> In-Reply-To: <20180724171152.24921-1-arkholga@tarantool.org> References: <20180724171152.24921-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 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)