Skip to content
Snippets Groups Projects
Commit eca0d0cc authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Fix say initialization

parent 0a6d86d7
No related branches found
No related tags found
No related merge requests found
......@@ -45,7 +45,8 @@ int sayfd = STDERR_FILENO;
pid_t logger_pid;
static bool booting = true;
static const char *binary_filename;
static int *log_level;
static int log_level_default = S_INFO;
static int *log_level = &log_level_default;
static void
sayf(int level, const char *filename, int line, const char *error,
......@@ -75,15 +76,15 @@ level_to_char(int level)
}
void
say_init(const char *argv0, int *level)
say_init(const char *argv0)
{
binary_filename = strdup(argv0);
log_level = level;
}
void
say_logger_init(char *logger, int nonblock)
say_logger_init(char *logger, int *level, int nonblock)
{
log_level = level;
int pipefd[2];
pid_t pid;
char cmd[] = { "/bin/sh" };
......
......@@ -51,10 +51,10 @@ extern int sayfd;
extern pid_t logger_pid;
/** Basic init. */
void say_init(const char *argv0, int *log_level);
void say_init(const char *argv0);
/* Move logging to a separate process. */
void say_logger_init(char *logger, int nonblock);
void say_logger_init(char *logger, int *log_level, int nonblock);
void vsay(int level, const char *filename, int line, const char *error,
const char *format, va_list ap)
......
......@@ -593,6 +593,7 @@ main(int argc, char **argv)
__libc_stack_end = (void*) &argv;
#endif
say_init(argv[0]);
crc32_init();
stat_init();
memory_init();
......@@ -607,7 +608,6 @@ main(int argc, char **argv)
void *opt = gopt_sort(&argc, (const char **)argv, opt_def);
main_opt = opt;
say_init(argv[0], &cfg.log_level);
if (gopt(opt, 'V')) {
printf("Tarantool %s\n", tarantool_version());
......@@ -769,7 +769,7 @@ main(int argc, char **argv)
strcat(custom_proc_title, cfg.custom_proc_title);
}
say_logger_init(cfg.logger, cfg.logger_nonblock);
say_logger_init(cfg.logger, &cfg.log_level, cfg.logger_nonblock);
/* main core cleanup routine */
atexit(tarantool_free);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment