summaryrefslogtreecommitdiff
path: root/src/cdrom_id
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-08-11 20:13:38 +0200
committerAnthony G. Basile <blueness@gentoo.org>2014-08-12 14:14:22 -0400
commitc597413eb3b84b24bc532331a4ab788c656ec0e2 (patch)
tree2aae2dca20cb0bbb8fde0c1d3dca0ed998b80597 /src/cdrom_id
parentba33e83c5a8eb5ea54546438d2cfcde27fd59757 (diff)
udev: never bypass our own logging framework and call vsyslog() directly from udev tools
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'src/cdrom_id')
-rw-r--r--src/cdrom_id/cdrom_id.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/cdrom_id/cdrom_id.c b/src/cdrom_id/cdrom_id.c
index 5733ee4247..4d0e6e073a 100644
--- a/src/cdrom_id/cdrom_id.c
+++ b/src/cdrom_id/cdrom_id.c
@@ -41,19 +41,12 @@
#include "libudev.h"
#include "libudev-private.h"
-static bool debug;
-
_printf_(6,0)
static void log_fn(struct udev *udev, int priority,
const char *file, int line, const char *fn,
const char *format, va_list args)
{
- if (debug) {
- fprintf(stderr, "%s: ", fn);
- vfprintf(stderr, format, args);
- } else {
- vsyslog(priority, format, args);
- }
+ log_metav(priority, file, line, fn, format, args);
}
/* device info */
@@ -879,11 +872,12 @@ int main(int argc, char *argv[])
int cnt;
int rc = 0;
+ log_open();
+
udev = udev_new();
if (udev == NULL)
goto exit;
- log_open();
udev_set_log_fn(udev, log_fn);
while (1) {
@@ -904,9 +898,10 @@ int main(int argc, char *argv[])
eject = true;
break;
case 'd':
- debug = true;
+ log_set_target(LOG_TARGET_CONSOLE);
log_set_max_level(LOG_DEBUG);
udev_set_log_priority(udev, LOG_DEBUG);
+ log_open();
break;
case 'h':
printf("Usage: cdrom_id [options] <device>\n"