Log power messages.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11313 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/scheduler/log.c b/scheduler/log.c
index 0d49357364b91c74374256bd64eac30d90538007..bbd858d8578a3aa4f5cb93bd677b720ce00af9b5 100644 (file)
--- a/scheduler/log.c
+++ b/scheduler/log.c
@@ -38,6 +38,8 @@
  * Local globals...
  */
 
+static _cups_mutex_t log_mutex = _CUPS_MUTEX_INITIALIZER;
+                                       /* Mutex for logging */
 static int     log_linesize = 0;       /* Size of line for output file */
 static char    *log_line = NULL;       /* Line for output file */
 
@@ -991,6 +993,7 @@ int                                 /* O - 1 on success, 0 on failure */
 cupsdWriteErrorLog(int        level,   /* I - Log level */
                    const char *message)        /* I - Message string */
 {
+  int          ret = 1;                /* Return value */
   static const char    levels[] =      /* Log levels... */
                {
                  ' ',
@@ -1022,18 +1025,26 @@ cupsdWriteErrorLog(int        level,    /* I - Log level */
   * Not using syslog; check the log file...
   */
 
+  _cupsMutexLock(&log_mutex);
+
   if (!cupsdCheckLogFile(&ErrorFile, ErrorLog))
-    return (0);
+  {
+    ret = 0;
+  }
+  else
+  {
+   /*
+    * Write the log message...
+    */
 
- /*
-  * Write the log message...
-  */
+    cupsFilePrintf(ErrorFile, "%c %s %s\n", levels[level],
+                   cupsdGetDateTime(NULL, LogTimeFormat), message);
+    cupsFileFlush(ErrorFile);
+  }
 
-  cupsFilePrintf(ErrorFile, "%c %s %s\n", levels[level],
-                 cupsdGetDateTime(NULL, LogTimeFormat), message);
-  cupsFileFlush(ErrorFile);
+  _cupsMutexUnlock(&log_mutex);
 
-  return (1);
+  return (ret);
 }
 
 

diff --git a/scheduler/sysman.c b/scheduler/sysman.c
index 3f3de62dd6137015aac6c0cf697d43a5c27a4ba2..b55b6c9764d8d5c082d3ee4822bacb647bfa1dfd 100644 (file)
--- a/scheduler/sysman.c
+++ b/scheduler/sysman.c
@@ -703,6 +703,52 @@ sysEventPowerNotifier(
        break;
   }
 
+  switch (messageType)
+  {
+    case kIOMessageCanSystemPowerOff :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageCanSystemPowerOff message.");
+       break;
+    case kIOMessageCanSystemSleep :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageCannSystemSleep message.");
+       break;
+    case kIOMessageSystemWillRestart :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageSystemWillRestart message.");
+       break;
+    case kIOMessageSystemWillPowerOff :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageSystemWillPowerOff message.");
+       break;
+    case kIOMessageSystemWillSleep :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageSystemWillSleep message.");
+       break;
+    case kIOMessageSystemHasPoweredOn :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageSystemHasPoweredOn message.");
+       break;
+    case kIOMessageSystemWillNotPowerOff :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageSystemWillNotPowerOff message.");
+       break;
+    case kIOMessageSystemWillNotSleep :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageSystemWillNotSleep message.");
+       break;
+#  ifdef kIOMessageSystemWillPowerOn
+    case kIOMessageSystemWillPowerOn :
+        cupsdLogMessage(CUPSD_LOG_DEBUG,
+                        "Got kIOMessageSystemWillPowerOn message.");
+       break;
+#  endif /* kIOMessageSystemWillPowerOn */
+    default:
+        cupsdLogMessage(CUPSD_LOG_DEBUG, "Got unknown power message %d.",
+                        (int)messageType);
+       break;
+  }
+
   if (sendit == 0)
     IOAllowPowerChange(threadData->sysevent.powerKernelPort,
                        (long)messageArgument);