aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerj Kalichev <serj.kalichev@gmail.com>2015-02-23 15:26:47 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2015-02-23 15:26:47 +0100
commit1eafd4494706c21a87dc66e4e0afa8799b576cb5 (patch)
treea48114b0631cbb33ecf55209637e622e1a48d245
parentc5beaa08eb57c542768eebfdf6532e72c5c0c16b (diff)
downloadbusybox-w32-1eafd4494706c21a87dc66e4e0afa8799b576cb5.tar.gz
busybox-w32-1eafd4494706c21a87dc66e4e0afa8799b576cb5.tar.bz2
busybox-w32-1eafd4494706c21a87dc66e4e0afa8799b576cb5.zip
acpid: fix logging
Without this patch acpid can't log the events at all. Moreover it tries to truncate log file every time. Signed-off-by: Serj Kalichev <serj.kalichev@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--util-linux/acpid.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/util-linux/acpid.c b/util-linux/acpid.c
index 38421c2d7..fc8151f6a 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -121,10 +121,8 @@ static void process_event(const char *event)
121 char *handler = xasprintf("./%s", event); 121 char *handler = xasprintf("./%s", event);
122 const char *args[] = { "run-parts", handler, NULL }; 122 const char *args[] = { "run-parts", handler, NULL };
123 123
124 // debug info 124 // log the event
125 if (option_mask32 & OPT_d) { 125 bb_error_msg("%s", event);
126 bb_error_msg("%s", event);
127 }
128 126
129 // spawn handler 127 // spawn handler
130 // N.B. run-parts would require scripts to have #!/bin/sh 128 // N.B. run-parts would require scripts to have #!/bin/sh
@@ -256,7 +254,7 @@ int acpid_main(int argc UNUSED_PARAM, char **argv)
256 /* No -d "Debug", we log to log file. 254 /* No -d "Debug", we log to log file.
257 * This includes any output from children. 255 * This includes any output from children.
258 */ 256 */
259 xmove_fd(xopen(opt_logfile, O_WRONLY | O_CREAT | O_TRUNC), STDOUT_FILENO); 257 xmove_fd(xopen(opt_logfile, O_WRONLY | O_CREAT | O_APPEND), STDOUT_FILENO);
260 xdup2(STDOUT_FILENO, STDERR_FILENO); 258 xdup2(STDOUT_FILENO, STDERR_FILENO);
261 /* Also, acpid's messages (but not children) will go to syslog too */ 259 /* Also, acpid's messages (but not children) will go to syslog too */
262 openlog(applet_name, LOG_PID, LOG_DAEMON); 260 openlog(applet_name, LOG_PID, LOG_DAEMON);