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 8F21A27173 for ; Tue, 17 Jul 2018 05:03:03 -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 K2aHLry2QF_t for ; Tue, 17 Jul 2018 05:03:03 -0400 (EDT) Received: from smtp5.mail.ru (smtp5.mail.ru [94.100.179.24]) (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 4D48F27163 for ; Tue, 17 Jul 2018 05:03:03 -0400 (EDT) From: Olga Arkhangelskaia Subject: [tarantool-patches] [PATCH v2 3/3] Syslog destination test unix socket Date: Tue, 17 Jul 2018 12:02:51 +0300 Message-Id: <20180717090251.53077-4-arkholga@tarantool.org> In-Reply-To: <20180717090251.53077-1-arkholga@tarantool.org> References: <20180717090251.53077-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 app-tap. Test redirects logs to newly created unix socket and sets appropriate log level. If log receives the same level - test passes. Usage: test-run.py syslog Issue:3487 --- https://github.com/tarantool/tarantool/issues/3487 Branch: OKriw/gh-3487-syslog-conf-dest --- https://github.com/tarantool/tarantool/tree/OKriw/gh-3487-syslog-conf-dest test/app-tap/syslog_socket.test.lua | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100755 test/app-tap/syslog_socket.test.lua diff --git a/test/app-tap/syslog_socket.test.lua b/test/app-tap/syslog_socket.test.lua new file mode 100755 index 000000000..febe106f5 --- /dev/null +++ b/test/app-tap/syslog_socket.test.lua @@ -0,0 +1,40 @@ +#!/usr/bin/env tarantool + +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') + +test:plan(1) +local function start_server() + test:diag("Create unix socket at %s", path) + local unix_socket = socket('AF_UNIX', 'SOCK_DGRAM',0) + unix_socket:bind('unix/', path) + socket.tcp_connect('unix', path) + return unix_socket +end + +local function find_log_str (test, socket) + local buf + local opt = string.format("syslog:server=unix:%s,identity=tarantool", path) + print (opt) + box.cfg{log = opt, log_level = 5} + log.info("Test remote syslog destination") + buf = socket:read("Test remote syslog destination", 30) + if buf ~= nil then + test:ok(buf:match('Test remote syslog destination'), "syslog_unix") + else + test:fail("syslog_unix") + end +end + +sock = start_server() + +test:test('syslog_unix',find_log_str(test, sock)) +sock:close() +os.remove(path) +os.exit(test:check() == true) -- 2.14.3 (Apple Git-98)