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 BBC3A26902 for ; Tue, 17 Jul 2018 06:25:18 -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 TQ8Ve5ZcK1sN for ; Tue, 17 Jul 2018 06:25:18 -0400 (EDT) Received: from smtp34.i.mail.ru (smtp34.i.mail.ru [94.100.177.94]) (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 757EB26992 for ; Tue, 17 Jul 2018 06:25:18 -0400 (EDT) From: Olga Arkhangelskaia Subject: [tarantool-patches] [PATCH 2/2] Fixes logging to syslog Date: Tue, 17 Jul 2018 13:25:08 +0300 Message-Id: <20180717102508.87945-2-arkholga@tarantool.org> In-Reply-To: <20180717102508.87945-1-arkholga@tarantool.org> References: <20180717102508.87945-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 Mode logging to syslog was broken due to assertion in case ov vaild configuration: box.cfg{log = 'syslog:identity=tarantool'} Isue: #3502 --- https://github.com/tarantool/tarantool/issues/3502 Branch: OKriw/gh-3502-syslog-fix --- https://github.com/tarantool/tarantool/tree/OKriw/gh-3502-syslog-fix --- src/box/box.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/box/box.cc b/src/box/box.cc index 7c6312d78..9252e82c1 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -375,9 +375,9 @@ box_check_say() tnt_raise(ClientError, ER_CFG, "log", diag_last_error(diag_get())->errmsg); } + diag_raise(); } say_free_syslog_opts(&opts); - diag_raise(); } const char *log_format = cfg_gets("log_format"); -- 2.14.3 (Apple Git-98)