projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dpif-netdev: Do not log error for EOPNOTSUPP return from netdev_recv().
[openvswitch]
/
lib
/
daemon.c
diff --git
a/lib/daemon.c
b/lib/daemon.c
index bbcfe6afc7ebb5288178394a616eb31cf3f775cb..c6489cd5bb2be128ed0f3a0fb5b24759d75efbf4 100644
(file)
--- a/
lib/daemon.c
+++ b/
lib/daemon.c
@@
-23,6
+23,7
@@
#include <string.h>
#include <sys/resource.h>
#include <sys/wait.h>
#include <string.h>
#include <sys/resource.h>
#include <sys/wait.h>
+#include <sys/stat.h>
#include <unistd.h>
#include "command-line.h"
#include "fatal-signal.h"
#include <unistd.h>
#include "command-line.h"
#include "fatal-signal.h"
@@
-34,7
+35,7
@@
#include "util.h"
#include "vlog.h"
#include "util.h"
#include "vlog.h"
-VLOG_DEFINE_THIS_MODULE(daemon)
+VLOG_DEFINE_THIS_MODULE(daemon)
;
/* --detach: Should we run in the background? */
static bool detach;
/* --detach: Should we run in the background? */
static bool detach;
@@
-366,13
+367,13
@@
monitor_daemon(pid_t daemon_pid)
ovs_fatal(errno, "waitpid failed");
} else if (retval == daemon_pid) {
char *s = process_status_msg(status);
ovs_fatal(errno, "waitpid failed");
} else if (retval == daemon_pid) {
char *s = process_status_msg(status);
- free(status_msg);
- status_msg = xasprintf("%d crashes: pid %lu died, %s",
- ++crashes,
- (unsigned long int) daemon_pid, s);
- free(s);
-
if (should_restart(status)) {
if (should_restart(status)) {
+ free(status_msg);
+ status_msg = xasprintf("%d crashes: pid %lu died, %s",
+ ++crashes,
+ (unsigned long int) daemon_pid, s);
+ free(s);
+
if (WCOREDUMP(status)) {
/* Disable further core dumps to save disk space. */
struct rlimit r;
if (WCOREDUMP(status)) {
/* Disable further core dumps to save disk space. */
struct rlimit r;
@@
-406,7
+407,9
@@
monitor_daemon(pid_t daemon_pid)
break;
}
} else {
break;
}
} else {
- VLOG_INFO("%s, exiting", status_msg);
+ VLOG_INFO("pid %lu died, %s, exiting",
+ (unsigned long int) daemon_pid, s);
+ free(s);
exit(0);
}
}
exit(0);
}
}