From c22fbb9b457295450f754c1c8787786431dab799 Mon Sep 17 00:00:00 2001 From: Quentin Young Date: Tue, 12 Sep 2017 14:49:06 -0400 Subject: [PATCH] lib: smallify loglock Signed-off-by: Quentin Young --- lib/log.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/log.c b/lib/log.c index 4915463c3e..02af55d465 100644 --- a/lib/log.c +++ b/lib/log.c @@ -796,10 +796,6 @@ int zlog_set_file(const char *filename, int log_level) /* There is opend file. */ zlog_reset_file(); - pthread_mutex_lock(&loglock); - - zl = zlog_default; - /* Open file. */ oldumask = umask(0777 & ~LOGFILE_MASK); fp = fopen(filename, "a"); @@ -807,15 +803,17 @@ int zlog_set_file(const char *filename, int log_level) if (fp == NULL) { ret = 0; } else { + pthread_mutex_lock(&loglock); + zl = zlog_default; + /* Set flags. */ zl->filename = XSTRDUP(MTYPE_ZLOG, filename); zl->maxlvl[ZLOG_DEST_FILE] = log_level; zl->fp = fp; logfile_fd = fileno(fp); + pthread_mutex_unlock(&loglock); } - pthread_mutex_unlock(&loglock); - return ret; } -- 2.39.5