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 11FF021868 for ; Tue, 10 Jul 2018 04:12:07 -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 d5YXStAYPDsr for ; Tue, 10 Jul 2018 04:12:07 -0400 (EDT) Received: from smtp56.i.mail.ru (smtp56.i.mail.ru [217.69.128.36]) (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 B9B6821852 for ; Tue, 10 Jul 2018 04:12:06 -0400 (EDT) From: Olga Arkhangelskaia Subject: [tarantool-patches] [PATCH] Fixes logging to syslog Date: Tue, 10 Jul 2018 11:11:49 +0300 Message-Id: <20180710081149.88806-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 Fixes assertion when setting log to syslog box.cfg{log = 'syslog:identity=tarantool'} Closes #3502 --- 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 f00a4f32d..033829a7f 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -355,9 +355,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)