]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: smallify loglock 1110/head
authorQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 12 Sep 2017 18:49:06 +0000 (14:49 -0400)
committerQuentin Young <qlyoung@cumulusnetworks.com>
Tue, 12 Sep 2017 18:49:58 +0000 (14:49 -0400)
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
lib/log.c

index 4915463c3e657a974bc2168f3113f83223151c05..02af55d46516d568f832f7c2f9ed4637e18a9802 100644 (file)
--- 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;
 }