summaryrefslogtreecommitdiff
path: root/udevsend.c
diff options
context:
space:
mode:
authorkay.sievers@vrfy.org <kay.sievers@vrfy.org>2005-03-27 00:11:03 +0100
committerGreg KH <gregkh@suse.de>2005-04-26 23:54:59 -0700
commit6b493a20e1dbf90a4e54d3be37027fa906220c31 (patch)
tree4bceed1a0432468d77b9a0fa4aa5b553dd38f96f /udevsend.c
parent65005a7f81f86590f7f03bd3d4019c485d0e3c77 (diff)
[PATCH] support log-priority levels in udev.conf
Diffstat (limited to 'udevsend.c')
-rw-r--r--udevsend.c32
1 files changed, 19 insertions, 13 deletions
diff --git a/udevsend.c b/udevsend.c
index dcd5a2ae93..8915edacc8 100644
--- a/udevsend.c
+++ b/udevsend.c
@@ -44,12 +44,15 @@
static int sock = -1;
#ifdef USE_LOG
-void log_message (int level, const char *format, ...)
+void log_message (int priority, const char *format, ...)
{
- va_list args;
+ va_list args;
+
+ if (priority > udev_log_priority)
+ return;
va_start(args, format);
- vsyslog(level, format, args);
+ vsyslog(priority, format, args);
va_end(args);
}
#endif
@@ -71,17 +74,17 @@ static int start_daemon(void)
/* daemon with empty environment */
close(sock);
execve(UDEVD_BIN, argv, envp);
- dbg("exec of daemon failed");
+ err("exec of daemon failed");
_exit(1);
case -1:
- dbg("fork of daemon failed");
+ err("fork of daemon failed");
return -1;
default:
exit(0);
}
break;
case -1:
- dbg("fork of helper failed");
+ err("fork of helper failed");
return -1;
default:
waitpid(pid, NULL, 0);
@@ -99,11 +102,11 @@ static void run_udev(const char *subsystem)
case 0:
/* child */
execv(UDEV_BIN, argv);
- dbg("exec of child failed");
+ err("exec of udev child failed");
_exit(1);
break;
case -1:
- dbg("fork of child failed");
+ err("fork of udev child failed");
break;
default:
waitpid(pid, NULL, 0);
@@ -124,11 +127,14 @@ int main(int argc, char *argv[], char *envp[])
const char *subsystem = NULL;
logging_init("udevsend");
+#ifdef USE_LOG
+ udev_init_config();
+#endif
dbg("version %s", UDEV_VERSION);
sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
if (sock == -1) {
- dbg("error getting socket");
+ err("error getting socket");
goto fallback;
}
@@ -156,7 +162,7 @@ int main(int argc, char *argv[], char *envp[])
}
if (bufpos + keylen >= HOTPLUG_BUFFER_SIZE-1) {
- dbg("environment buffer too small, probably not called by the kernel");
+ err("environment buffer too small, probably not called by the kernel");
continue;
}
@@ -187,12 +193,12 @@ int main(int argc, char *argv[], char *envp[])
}
if (errno != ECONNREFUSED) {
- dbg("error sending message (%s)", strerror(errno));
+ err("error sending message (%s)", strerror(errno));
goto fallback;
}
if (!started_daemon) {
- dbg("try to start udevd daemon");
+ info("try to start udevd daemon");
retval = start_daemon();
if (retval) {
dbg("error starting daemon");
@@ -207,7 +213,7 @@ int main(int argc, char *argv[], char *envp[])
}
fallback:
- info("unable to connect to event daemon, try to call udev directly");
+ err("unable to connect to event daemon, try to call udev directly");
run_udev(subsystem);
exit: