Fix a long-standing logging issue with messages logged from a background printer setup thread (Issue #1450)

Author: michaelrsweet

scheduler/log.c

@@ -503,9 +503,10 @@ cupsdLogClient(cupsd_client_t *con,	/* I - Client connection */
                const char     *message,	/* I - Printf-style message string */
                ...)			/* I - Additional arguments as needed */
 {
-  va_list		ap, ap2;	/* Argument pointers */
-  char			clientmsg[1024];/* Format string for client message */
-  int			status;		/* Formatting status */
+  int		ret;			/* Return value */
+  va_list	ap, ap2;		/* Argument pointers */
+  char		clientmsg[1024];	/* Format string for client message */
+  int		status;			/* Formatting status */
 
 
  /*
@@ -522,6 +523,8 @@ cupsdLogClient(cupsd_client_t *con,	/* I - Client connection */
   * Format and write the log message...
   */
 
+  _cupsMutexLock(&log_mutex);
+
   if (con)
     snprintf(clientmsg, sizeof(clientmsg), "[Client %d] %s", con->number,
              message);
@@ -541,10 +544,13 @@ cupsdLogClient(cupsd_client_t *con,	/* I - Client connection */
   va_end(ap);
 
   if (status > 0)
-    return (cupsdWriteErrorLog(level, log_line));
+    ret = cupsdWriteErrorLog(level, log_line);
   else
-    return (cupsdWriteErrorLog(CUPSD_LOG_ERROR,
-                               "Unable to allocate memory for log line."));
+    ret = cupsdWriteErrorLog(CUPSD_LOG_ERROR, "Unable to allocate memory for log line.");
+
+  _cupsMutexUnlock(&log_mutex);
+
+  return (ret);
 }
 
 
@@ -558,9 +564,10 @@ cupsdLogJob(cupsd_job_t *job,		/* I - Job */
 	    const char  *message,	/* I - Printf-style message string */
 	    ...)			/* I - Additional arguments as needed */
 {
-  va_list		ap, ap2;	/* Argument pointers */
-  char			jobmsg[1024];	/* Format string for job message */
-  int			status;		/* Formatting status */
+  int		ret;			/* Return value */
+  va_list	ap, ap2;		/* Argument pointers */
+  char		jobmsg[1024];		/* Format string for job message */
+  int		status;			/* Formatting status */
 
 
  /*
@@ -577,6 +584,8 @@ cupsdLogJob(cupsd_job_t *job,		/* I - Job */
   * Format and write the log message...
   */
 
+  _cupsMutexLock(&log_mutex);
+
   if (job)
     snprintf(jobmsg, sizeof(jobmsg), "[Job %d] %s", job->id, message);
   else
@@ -633,7 +642,7 @@ cupsdLogJob(cupsd_job_t *job,		/* I - Job */
       else if (temp)
 	free(temp);
 
-      return (1);
+      ret = 1;
     }
     else if (level <= LogLevel)
     {
@@ -666,19 +675,26 @@ cupsdLogJob(cupsd_job_t *job,		/* I - Job */
 			  "PRIORITY=%i", log_levels[level],
 			  NULL);
 
-	return (1);
+	ret = 1;
       }
       else
 #endif /* HAVE_SYSTEMD_SD_JOURNAL_H */
 
-      return (cupsdWriteErrorLog(level, log_line));
+      ret = cupsdWriteErrorLog(level, log_line);
     }
     else
-      return (1);
+    {
+      ret = 1;
+    }
   }
   else
-    return (cupsdWriteErrorLog(CUPSD_LOG_ERROR,
-                               "Unable to allocate memory for log line."));
+  {
+    ret = cupsdWriteErrorLog(CUPSD_LOG_ERROR, "Unable to allocate memory for log line.");
+  }
+
+  _cupsMutexUnlock(&log_mutex);
+
+  return (ret);
 }
 
 
@@ -691,8 +707,9 @@ cupsdLogMessage(int        level,	/* I - Log level */
                 const char *message,	/* I - printf-style message string */
 	        ...)			/* I - Additional args as needed */
 {
-  va_list		ap, ap2;	/* Argument pointers */
-  int			status;		/* Formatting status */
+  int		ret;			/* Return value */
+  va_list	ap, ap2;		/* Argument pointers */
+  int		status;			/* Formatting status */
 
 
  /*
@@ -746,6 +763,8 @@ cupsdLogMessage(int        level,	/* I - Log level */
   * Format and write the log message...
   */
 
+  _cupsMutexLock(&log_mutex);
+
   va_start(ap, message);
 
   do
@@ -759,10 +778,13 @@ cupsdLogMessage(int        level,	/* I - Log level */
   va_end(ap);
 
   if (status > 0)
-    return (cupsdWriteErrorLog(level, log_line));
+    ret = cupsdWriteErrorLog(level, log_line);
   else
-    return (cupsdWriteErrorLog(CUPSD_LOG_ERROR,
-                               "Unable to allocate memory for log line!"));
+    ret = cupsdWriteErrorLog(CUPSD_LOG_ERROR, "Unable to allocate memory for log line.");
+
+  _cupsMutexUnlock(&log_mutex);
+
+  return (ret);
 }
 
 
@@ -1263,8 +1285,6 @@ cupsdWriteErrorLog(int        level,	/* I - Log level */
   * Not using syslog; check the log file...
   */
 
-  _cupsMutexLock(&log_mutex);
-
   if (!cupsdCheckLogFile(&ErrorFile, ErrorLog))
   {
     ret = 0;
@@ -1280,8 +1300,6 @@ cupsdWriteErrorLog(int        level,	/* I - Log level */
     cupsFileFlush(ErrorFile);
   }
 
-  _cupsMutexUnlock(&log_mutex);
-
   return (ret);
 }