projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vlist: fix node version update for tree->keep_old/no_delete
[project/netifd.git]
/
main.c
diff --git
a/main.c
b/main.c
index
c918203
..
2d8e46b
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-21,6
+21,17
@@
static char **global_argv;
static struct list_head process_list = LIST_HEAD_INIT(process_list);
static struct list_head fds = LIST_HEAD_INIT(fds);
static struct list_head process_list = LIST_HEAD_INIT(process_list);
static struct list_head fds = LIST_HEAD_INIT(fds);
+#define DEFAULT_LOG_LEVEL L_NOTICE
+
+static int log_level = DEFAULT_LOG_LEVEL;
+static const int log_class[] = {
+ [L_CRIT] = LOG_CRIT,
+ [L_WARNING] = LOG_WARNING,
+ [L_NOTICE] = LOG_NOTICE,
+ [L_INFO] = LOG_INFO,
+ [L_DEBUG] = LOG_DEBUG
+};
+
#ifdef DUMMY_MODE
#define use_syslog false
#else
#ifdef DUMMY_MODE
#define use_syslog false
#else
@@
-35,6
+46,10
@@
netifd_delete_process(struct netifd_process *proc)
uloop_process_delete(&proc->uloop);
list_del(&proc->list);
netifd_fd_delete(&proc->log_fd);
uloop_process_delete(&proc->uloop);
list_del(&proc->list);
netifd_fd_delete(&proc->log_fd);
+ if (proc->log_buf) {
+ free(proc->log_buf);
+ proc->log_buf = NULL;
+ }
}
void
}
void
@@
-42,9
+57,12
@@
netifd_log_message(int priority, const char *format, ...)
{
va_list vl;
{
va_list vl;
+ if (priority > log_level)
+ return;
+
va_start(vl, format);
if (use_syslog)
va_start(vl, format);
if (use_syslog)
- vsyslog(
priority
, format, vl);
+ vsyslog(
log_class[priority]
, format, vl);
else
vfprintf(stderr, format, vl);
va_end(vl);
else
vfprintf(stderr, format, vl);
va_end(vl);
@@
-63,30
+81,31
@@
netifd_process_log_cb(struct uloop_fd *fd, unsigned int events)
if (!proc->log_buf)
proc->log_buf = malloc(LOG_BUF_SIZE + 1);
if (!proc->log_buf)
proc->log_buf = malloc(LOG_BUF_SIZE + 1);
- buf = proc->log_buf + proc->log_buf_ofs;
- maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
-
log_prefix = proc->log_prefix;
if (!log_prefix)
log_prefix = "process";
retry:
log_prefix = proc->log_prefix;
if (!log_prefix)
log_prefix = "process";
retry:
+ buf = proc->log_buf + proc->log_buf_ofs;
+ maxlen = LOG_BUF_SIZE - proc->log_buf_ofs;
read_len = len = read(fd->fd, buf, maxlen);
read_len = len = read(fd->fd, buf, maxlen);
- if (len <
=
0) {
+ if (len < 0) {
if (errno == EINTR)
goto retry;
if (errno == EINTR)
goto retry;
- return;
- }
+ goto out;
+ } else if (len == 0)
+ goto out;
+
proc->log_buf_ofs += len;
cur = buf;
buf = proc->log_buf;
proc->log_buf_ofs += len;
cur = buf;
buf = proc->log_buf;
- while ((cur = memchr(cur, '\n', len))) {
+ while (
len > 0 &&
(cur = memchr(cur, '\n', len))) {
*cur = 0;
if (!proc->log_overflow)
*cur = 0;
if (!proc->log_overflow)
- netifd_log_message(L
OG
_NOTICE, "%s (%d): %s\n",
+ netifd_log_message(L_NOTICE, "%s (%d): %s\n",
log_prefix, proc->uloop.pid, buf);
else
proc->log_overflow = false;
log_prefix, proc->uloop.pid, buf);
else
proc->log_overflow = false;
@@
-102,7
+121,7
@@
retry:
if (len == LOG_BUF_SIZE) {
if (!proc->log_overflow) {
proc->log_buf[LOG_BUF_SIZE] = 0;
if (len == LOG_BUF_SIZE) {
if (!proc->log_overflow) {
proc->log_buf[LOG_BUF_SIZE] = 0;
- netifd_log_message(L
OG
_NOTICE, "%s (%d): %s [...]\n",
+ netifd_log_message(L_NOTICE, "%s (%d): %s [...]\n",
log_prefix, proc->uloop.pid, proc->log_buf);
proc->log_overflow = true;
}
log_prefix, proc->uloop.pid, proc->log_buf);
proc->log_overflow = true;
}
@@
-110,8
+129,12
@@
retry:
}
proc->log_buf_ofs = len;
}
proc->log_buf_ofs = len;
- if (read_len
== maxlen
)
+ if (read_len
> 0
)
goto retry;
goto retry;
+
+out:
+ if (fd->eof)
+ uloop_fd_delete(fd);
}
static void
}
static void
@@
-176,6
+199,7
@@
netifd_start_process(const char **argv, char **env, struct netifd_process *proc)
uloop_process_add(&proc->uloop);
list_add_tail(&proc->list, &process_list);
uloop_process_add(&proc->uloop);
list_add_tail(&proc->list, &process_list);
+ proc->log_buf_ofs = 0;
proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
proc->log_uloop.cb = netifd_process_log_cb;
netifd_fd_add(&proc->log_fd);
proc->log_uloop.fd = proc->log_fd.fd = pfds[0];
proc->log_uloop.cb = netifd_process_log_cb;
netifd_fd_add(&proc->log_fd);
@@
-195,7
+219,7
@@
netifd_kill_process(struct netifd_process *proc)
if (!proc->uloop.pending)
return;
if (!proc->uloop.pending)
return;
- kill(proc->uloop.pid, SIG
TERM
);
+ kill(proc->uloop.pid, SIG
KILL
);
netifd_delete_process(proc);
}
netifd_delete_process(proc);
}
@@
-218,7
+242,7
@@
static void netifd_do_restart(struct uloop_timeout *timeout)
static void netifd_do_reload(struct uloop_timeout *timeout)
{
static void netifd_do_reload(struct uloop_timeout *timeout)
{
- config_init_
interfaces(NULL
);
+ config_init_
all(
);
}
static struct uloop_timeout main_timer;
}
static struct uloop_timeout main_timer;
@@
-245,9
+269,10
@@
static int usage(const char *progname)
" -p <path>: Path to netifd addons (default: %s)\n"
" -h <path>: Path to the hotplug script\n"
" -r <path>: Path to resolv.conf\n"
" -p <path>: Path to netifd addons (default: %s)\n"
" -h <path>: Path to the hotplug script\n"
" -r <path>: Path to resolv.conf\n"
+ " -l <level>: Log output level (default: %d)\n"
" -S: Use stderr instead of syslog for log messages\n"
" (default: "DEFAULT_HOTPLUG_PATH")\n"
" -S: Use stderr instead of syslog for log messages\n"
" (default: "DEFAULT_HOTPLUG_PATH")\n"
- "\n", progname, main_path);
+ "\n", progname, main_path
, DEFAULT_LOG_LEVEL
);
return 1;
}
return 1;
}
@@
-291,7
+316,7
@@
int main(int argc, char **argv)
global_argv = argv;
global_argv = argv;
- while ((ch = getopt(argc, argv, "d:s:p:h:r:S")) != -1) {
+ while ((ch = getopt(argc, argv, "d:s:p:h:r:
l:
S")) != -1) {
switch(ch) {
case 'd':
debug_mask = strtoul(optarg, NULL, 0);
switch(ch) {
case 'd':
debug_mask = strtoul(optarg, NULL, 0);
@@
-308,6
+333,11
@@
int main(int argc, char **argv)
case 'r':
resolv_conf = optarg;
break;
case 'r':
resolv_conf = optarg;
break;
+ case 'l':
+ log_level = atoi(optarg);
+ if (log_level >= ARRAY_SIZE(log_class))
+ log_level = ARRAY_SIZE(log_class) - 1;
+ break;
#ifndef DUMMY_MODE
case 'S':
use_syslog = false;
#ifndef DUMMY_MODE
case 'S':
use_syslog = false;
@@
-332,7
+362,7
@@
int main(int argc, char **argv)
return 1;
}
return 1;
}
- config_init_
interfaces(NULL
);
+ config_init_
all(
);
uloop_run();
netifd_kill_processes();
uloop_run();
netifd_kill_processes();