udevd: track exit status of event process

[elogind.git] / logging.h

diff --git a/logging.h b/logging.h
index 30f52c84ce6969eda5b0fb54c1a2c4151389c802..dd520dd874908d39bd6771bc71437b06b65d7778 100644 (file)
--- a/logging.h
+++ b/logging.h
@@ -24,53 +24,44 @@
 #ifndef LOGGING_H
 #define LOGGING_H
 
+#define err(format, arg...)            do { } while (0)
 #define info(format, arg...)           do { } while (0)
 #define dbg(format, arg...)            do { } while (0)
-#define dbg_parse(format, arg...)      do { } while (0)
 #define logging_init(foo)              do { } while (0)
 #define logging_close(foo)             do { } while (0)
 
-#ifdef LOG
+#ifdef USE_LOG
 #include <stdarg.h>
 #include <unistd.h>
 #include <syslog.h>
 
-#define LOGNAME_SIZE                   42
+#undef err
+#define err(format, arg...)                                                    \
+       do {                                                                    \
+               log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg);              \
+       } while (0)
 
 #undef info
-#define info(format, arg...)                                                           \
-       do {                                                                            \
-               log_message(LOG_INFO , format , ## arg);                                \
+#define info(format, arg...)                                                   \
+       do {                                                                    \
+               log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg);             \
        } while (0)
 
 #ifdef DEBUG
 #undef dbg
-#define dbg(format, arg...)                                                            \
-       do {                                                                            \
-               log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
+#define dbg(format, arg...)                                                    \
+       do {                                                                    \
+               log_message(LOG_DEBUG ,"%s: " format ,__FUNCTION__ ,## arg);    \
        } while (0)
 #endif
 
-/* Parser needs it's own debugging statement, we usually don't care about this at all */
-#ifdef DEBUG_PARSER
-#undef dbg_parse
-#define dbg_parse(format, arg...)                                                      \
-       do {                                                                            \
-               log_message(LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
-       } while (0)
-#endif
-
-extern void log_message(int level, const char *format, ...)
+extern void log_message(int priority, const char *format, ...)
        __attribute__ ((format (printf, 2, 3)));
 
-/* each program that uses syslog must declare this variable somewhere */
-extern unsigned char logname[LOGNAME_SIZE];
-
 #undef logging_init
-static inline void logging_init(char *program_name)
+static inline void logging_init(const char *program_name)
 {
-       snprintf(logname, LOGNAME_SIZE,"%s[%d]", program_name, getpid());
-       openlog(logname, 0, LOG_DAEMON);
+       openlog(program_name, LOG_PID | LOG_CONS, LOG_DAEMON);
 }
 
 #undef logging_close
@@ -79,6 +70,6 @@ static inline void logging_close(void)
        closelog();
 }
 
-#endif /* LOG */
+#endif /* USE_LOG */
 
 #endif