#include "libubus.h"
#include "syslog.h"
+#define LOGD_CONNECT_RETRY 10
+
enum {
LOG_STDOUT,
LOG_FILE,
static int log_type = LOG_STDOUT;
static int log_size, log_udp, log_follow, log_trailer_null = 0;
static int log_timestamp;
+static int logd_conn_tries = LOGD_CONNECT_RETRY;
+static int facility_include;
+static int facility_exclude;
+
+/* check for facility filter; return 0 if message shall be dropped */
+static int check_facility_filter(int f)
+{
+ if (facility_include)
+ return !!(facility_include & (1 << f));
+ if (facility_exclude)
+ return !(facility_exclude & (1 << f));
+ return 1;
+}
static const char* getcodetext(int value, CODE *codetable) {
CODE *i;
{
sender.fd = usock((log_udp) ? (USOCK_UDP) : (USOCK_TCP), log_ip, log_port);
if (sender.fd < 0) {
- fprintf(stderr, "failed to connect: %s\n", strerror(errno));
+ fprintf(stderr, "failed to connect: %m\n");
uloop_timeout_set(&retry, 1000);
} else {
uloop_fd_add(&sender, ULOOP_READ);
}
sender.fd = open(log_file, O_CREAT | O_WRONLY | O_APPEND, 0600);
if (sender.fd < 0) {
- fprintf(stderr, "failed to open %s: %s\n", log_file, strerror(errno));
+ fprintf(stderr, "failed to open %s: %m\n", log_file);
exit(-1);
}
}
+ p = blobmsg_get_u32(tb[LOG_PRIO]);
+
+ if (!check_facility_filter(LOG_FAC(p)))
+ return 0;
m = blobmsg_get_string(tb[LOG_MSG]);
if (regexp_pattern &&
(unsigned long)t, t_ms);
}
c = ctime(&t);
- p = blobmsg_get_u32(tb[LOG_PRIO]);
c[strlen(c) - 1] = '\0';
if (log_type == LOG_NET) {
" -p <file> PID file\n"
" -h <hostname> Add hostname to the message\n"
" -P <prefix> Prefix custom text to streamed messages\n"
+ " -z <facility> handle only messages with given facility (0-23), repeatable\n"
+ " -Z <facility> ignore messages with given facility (0-23), repeatable\n"
" -f Follow log messages\n"
" -u Use UDP as the protocol\n"
" -t Add an extra timestamp\n"
static void logread_fd_state_cb(struct ustream *s)
{
+ if (log_follow)
+ logd_conn_tries = LOGD_CONNECT_RETRY;
uloop_end();
}
{
static struct ustream_fd test_fd;
+ memset(&test_fd, 0, sizeof(test_fd));
+
test_fd.stream.notify_read = logread_fd_data_cb;
test_fd.stream.notify_state = logread_fd_state_cb;
ustream_fd_init(&test_fd, fd);
}
+static void logread_setup_output(void)
+{
+ if (sender.fd || sender.cb)
+ return;
+
+ if (log_ip && log_port) {
+ openlog("logread", LOG_PID, LOG_DAEMON);
+ log_type = LOG_NET;
+ sender.cb = log_handle_fd;
+ retry.cb = log_handle_reconnect;
+ uloop_timeout_set(&retry, 1000);
+ } else if (log_file) {
+ log_type = LOG_FILE;
+ sender.fd = open(log_file, O_CREAT | O_WRONLY| O_APPEND, 0600);
+ if (sender.fd < 0) {
+ fprintf(stderr, "failed to open %s: %m\n", log_file);
+ exit(-1);
+ }
+ } else {
+ sender.fd = STDOUT_FILENO;
+ }
+}
+
int main(int argc, char **argv)
{
- static struct ubus_request req;
struct ubus_context *ctx;
uint32_t id;
const char *ubus_socket = NULL;
int ch, ret, lines = 0;
static struct blob_buf b;
- int tries = 5;
signal(SIGPIPE, SIG_IGN);
- while ((ch = getopt(argc, argv, "u0fcs:l:r:F:p:S:P:h:e:t")) != -1) {
+ while ((ch = getopt(argc, argv, "u0fcs:l:z:Z:r:F:p:S:P:h:e:t")) != -1) {
switch (ch) {
case 'u':
log_udp = 1;
case 'l':
lines = atoi(optarg);
break;
+ case 'z':
+ id = strtoul(optarg, NULL, 0) & 0x1f;
+ facility_include |= (1 << id);
+ break;
+ case 'Z':
+ id = strtoul(optarg, NULL, 0) & 0x1f;
+ facility_exclude |= (1 << id);
+ break;
case 'S':
log_size = atoi(optarg);
if (log_size < 1)
}
ubus_add_uloop(ctx);
+ if (log_follow && pid_file) {
+ FILE *fp = fopen(pid_file, "w+");
+ if (fp) {
+ fprintf(fp, "%d", getpid());
+ fclose(fp);
+ }
+ }
+
+ blob_buf_init(&b, 0);
+ blobmsg_add_u8(&b, "stream", 1);
+ blobmsg_add_u8(&b, "oneshot", !log_follow);
+ if (lines)
+ blobmsg_add_u32(&b, "lines", lines);
+ else if (log_follow)
+ blobmsg_add_u32(&b, "lines", 0);
+
/* ugly ugly ugly ... we need a real reconnect logic */
do {
+ struct ubus_request req = { 0 };
+
ret = ubus_lookup_id(ctx, "log", &id);
if (ret) {
fprintf(stderr, "Failed to find log object: %s\n", ubus_strerror(ret));
sleep(1);
continue;
}
-
- blob_buf_init(&b, 0);
- blobmsg_add_u8(&b, "stream", 1);
- blobmsg_add_u8(&b, "oneshot", !log_follow);
- if (lines)
- blobmsg_add_u32(&b, "lines", lines);
- else if (log_follow)
- blobmsg_add_u32(&b, "lines", 0);
- if (log_follow) {
- if (pid_file) {
- FILE *fp = fopen(pid_file, "w+");
- if (fp) {
- fprintf(fp, "%d", getpid());
- fclose(fp);
- }
- }
- }
-
- if (log_ip && log_port) {
- openlog("logread", LOG_PID, LOG_DAEMON);
- log_type = LOG_NET;
- sender.cb = log_handle_fd;
- retry.cb = log_handle_reconnect;
- uloop_timeout_set(&retry, 1000);
- } else if (log_file) {
- log_type = LOG_FILE;
- sender.fd = open(log_file, O_CREAT | O_WRONLY| O_APPEND, 0600);
- if (sender.fd < 0) {
- fprintf(stderr, "failed to open %s: %s\n", log_file, strerror(errno));
- exit(-1);
- }
- } else {
- sender.fd = STDOUT_FILENO;
- }
+ logd_conn_tries = 0;
+ logread_setup_output();
ubus_invoke_async(ctx, id, "read", b.head, &req);
req.fd_cb = logread_fd_cb;
ubus_complete_request_async(ctx, &req);
uloop_run();
- ubus_free(ctx);
- uloop_done();
- } while (ret && tries--);
+ } while (logd_conn_tries--);
+
+ ubus_free(ctx);
+ uloop_done();
+
+ if (log_follow && pid_file)
+ unlink(pid_file);
return ret;
}
projects / project / ubox.git / blobdiff