From 330886d276f031002953663c92808b192e45757e Mon Sep 17 00:00:00 2001
From: Olga Arkhangelskaia <arkholga@tarantool.org>
Date: Tue, 24 Jul 2018 14:15:50 +0300
Subject: [PATCH] box: removed unnecessary check of log string
This check happens twice. The patch simply removes check.
---
src/box/box.cc | 5 -----
src/say.c | 18 ------------------
src/say.h | 8 --------
3 files changed, 31 deletions(-)
diff --git a/src/box/box.cc b/src/box/box.cc
index 3ed2a4a447..b6c22b0819 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -362,11 +362,6 @@ box_check_say()
diag_last_error(diag_get())->errmsg);
}
- if (say_check_init_str(log) == -1) {
-
- diag_raise();
- }
-
if (type == SAY_LOGGER_SYSLOG) {
struct say_syslog_opts opts;
if (say_parse_syslog_opts(log, &opts) < 0) {
diff --git a/src/say.c b/src/say.c
index 287ec50000..ac221dd19d 100644
--- a/src/say.c
+++ b/src/say.c
@@ -960,24 +960,6 @@ write_to_syslog(struct log *log, int total)
* Init string parser(s)
*/
-int
-say_check_init_str(const char *str)
-{
- enum say_logger_type type;
- if (say_parse_logger_type(&str, &type)) {
- diag_set(IllegalParams, logger_syntax_reminder);
- return -1;
- }
- if (type == SAY_LOGGER_SYSLOG) {
- struct say_syslog_opts opts;
-
- if (say_parse_syslog_opts(str, &opts) < 0)
- return -1;
- say_free_syslog_opts(&opts);
- }
- return 0;
-}
-
/**
* @retval string after prefix if a prefix is found,
* *str also is advanced to the prefix
diff --git a/src/say.h b/src/say.h
index f4c6b8eb92..2c2395fe0e 100644
--- a/src/say.h
+++ b/src/say.h
@@ -372,14 +372,6 @@ CFORMAT(printf, 5, 0) extern sayfunc_t _say;
#define log_say_syserror(log, format, ...) \
log_say_level(log, S_SYSERROR, strerror(errno), format, ##__VA_ARGS__)
-/**
- * validates logger init string;
- * @returns 0 if validation passed or -1
- * with an error message written to diag
- */
-int
-say_check_init_str(const char *str);
-
/* internals, for unit testing */
/**
--
GitLab