X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=logging.h;h=00b5f23b255eb4da13d85cdc35d9c50009ceb959;hp=0126de99eb94b2dec6d88896a809272a1f07d6f7;hb=7b05672ebb1cb6cefe25f7c83c193cf4c6947e2b;hpb=bebbc31b90056f5b0eafb52fc965f0cc713f0d4f

diff --git a/logging.h b/logging.h
index 0126de99e..00b5f23b2 100644
--- a/logging.h
+++ b/logging.h
@@ -38,13 +38,13 @@
 #undef err
 #define err(format, arg...)							\
 	do {									\
-		log_message(LOG_ERR ,"%s: " format ,__FILE__ ,## arg);		\
+		log_message(LOG_ERR ,"%s: " format ,__FUNCTION__ ,## arg);	\
 	} while (0)
 
 #undef info
 #define info(format, arg...)							\
 	do {									\
-		log_message(LOG_INFO ,"%s: " format ,__FILE__ ,## arg);		\
+		log_message(LOG_INFO ,"%s: " format ,__FUNCTION__ ,## arg);	\
 	} while (0)
 
 #ifdef DEBUG
@@ -61,7 +61,7 @@ extern void log_message(int priority, const char *format, ...)
 #undef logging_init
 static inline void logging_init(const char *program_name)
 {
-	openlog(program_name, LOG_PID, LOG_DAEMON);
+	openlog(program_name, LOG_PID | LOG_CONS, LOG_DAEMON);
 }
 
 #undef logging_close