#include <fcntl.h>
#include <time.h>
+#include <regex.h>
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
#define SYSLOG_NAMES
#include <syslog.h>
+#include <libubox/ustream.h>
#include <libubox/blobmsg_json.h>
#include <libubox/usock.h>
#include <libubox/uloop.h>
#include "libubus.h"
#include "syslog.h"
+#define LOGD_CONNECT_RETRY 10
+
enum {
LOG_STDOUT,
LOG_FILE,
[LOG_TIME] = { .name = "time", .type = BLOBMSG_TYPE_INT64 },
};
-static struct ubus_subscriber log_event;
static struct uloop_timeout retry;
static struct uloop_fd sender;
-static const char *log_file, *log_ip, *log_port, *log_prefix, *pid_file, *hostname;
+static regex_t regexp_preg;
+static const char *log_file, *log_ip, *log_port, *log_prefix, *pid_file, *hostname, *regexp_pattern;
static int log_type = LOG_STDOUT;
-static int log_size, log_udp;
+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 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);
- syslog(0, "Logread connected to %s:%s\n", log_ip, log_port);
+ syslog(LOG_INFO, "Logread connected to %s:%s\n", log_ip, log_port);
}
}
-static void log_handle_remove(struct ubus_context *ctx, struct ubus_subscriber *s,
- uint32_t id)
-{
- fprintf(stderr, "Object %08x went away\n", id);
-}
-
static void log_handle_fd(struct uloop_fd *u, unsigned int events)
{
if (u->eof) {
}
}
-static int log_notify(struct ubus_context *ctx, struct ubus_object *obj,
- struct ubus_request_data *req, const char *method,
- struct blob_attr *msg)
+static int log_notify(struct blob_attr *msg)
{
struct blob_attr *tb[__LOG_MAX];
struct stat s;
- char buf[512];
+ char buf[LOG_LINE_SIZE + 128];
+ char buf_ts[32];
uint32_t p;
- char *str;
time_t t;
- char *c;
+ uint32_t t_ms = 0;
+ char *c, *m;
+ int ret = 0;
if (sender.fd < 0)
return 0;
blobmsg_parse(log_policy, ARRAY_SIZE(log_policy), tb, blob_data(msg), blob_len(msg));
- if (!tb[LOG_ID] || !tb[LOG_PRIO] || !tb[LOG_SOURCE] || !tb[LOG_TIME])
+ if (!tb[LOG_ID] || !tb[LOG_PRIO] || !tb[LOG_SOURCE] || !tb[LOG_TIME] || !tb[LOG_MSG])
return 1;
if ((log_type == LOG_FILE) && log_size && (!stat(log_file, &s)) && (s.st_size > log_size)) {
}
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);
}
}
+ m = blobmsg_get_string(tb[LOG_MSG]);
+ if (regexp_pattern &&
+ regexec(®exp_preg, m, 0, NULL, 0) == REG_NOMATCH)
+ return 0;
t = blobmsg_get_u64(tb[LOG_TIME]) / 1000;
+ if (log_timestamp) {
+ t_ms = blobmsg_get_u64(tb[LOG_TIME]) % 1000;
+ snprintf(buf_ts, sizeof(buf_ts), "[%lu.%03u] ",
+ (unsigned long)t, t_ms);
+ }
c = ctime(&t);
p = blobmsg_get_u32(tb[LOG_PRIO]);
c[strlen(c) - 1] = '\0';
- str = blobmsg_format_json(msg, true);
+
if (log_type == LOG_NET) {
int err;
- *buf = '\0';
- if (hostname)
- snprintf(buf, sizeof(buf), "%s ", hostname);
+ snprintf(buf, sizeof(buf), "<%u>", p);
+ strncat(buf, c + 4, 16);
+ if (log_timestamp) {
+ strncat(buf, buf_ts, sizeof(buf) - strlen(buf) - 1);
+ }
+ if (hostname) {
+ strncat(buf, hostname, sizeof(buf) - strlen(buf) - 1);
+ strncat(buf, " ", sizeof(buf) - strlen(buf) - 1);
+ }
if (log_prefix) {
- strncat(buf, log_prefix, sizeof(buf));
- strncat(buf, ": ", sizeof(buf));
+ strncat(buf, log_prefix, sizeof(buf) - strlen(buf) - 1);
+ strncat(buf, ": ", sizeof(buf) - strlen(buf) - 1);
}
if (blobmsg_get_u32(tb[LOG_SOURCE]) == SOURCE_KLOG)
- strncat(buf, "kernel: ", sizeof(buf));
- strncat(buf, method, sizeof(buf));
+ strncat(buf, "kernel: ", sizeof(buf) - strlen(buf) - 1);
+ strncat(buf, m, sizeof(buf) - strlen(buf) - 1);
if (log_udp)
err = write(sender.fd, buf, strlen(buf));
- else
- err = send(sender.fd, buf, strlen(buf), 0);
+ else {
+ size_t buflen = strlen(buf);
+ if (!log_trailer_null)
+ buf[buflen] = '\n';
+ err = send(sender.fd, buf, buflen + 1, 0);
+ }
if (err < 0) {
- syslog(0, "failed to send log data to %s:%s via %s\n",
+ syslog(LOG_INFO, "failed to send log data to %s:%s via %s\n",
log_ip, log_port, (log_udp) ? ("udp") : ("tcp"));
uloop_fd_delete(&sender);
close(sender.fd);
uloop_timeout_set(&retry, 1000);
}
} else {
- snprintf(buf, sizeof(buf), "%s %s.%s%s %s\n",
- c, getcodetext(LOG_FAC(p) << 3, facilitynames), getcodetext(LOG_PRI(p), prioritynames),
- (blobmsg_get_u32(tb[LOG_SOURCE])) ? ("") : (" kernel:"),
- method);
- write(sender.fd, buf, strlen(buf));
+ snprintf(buf, sizeof(buf), "%s %s%s.%s%s %s\n",
+ c, log_timestamp ? buf_ts : "",
+ getcodetext(LOG_FAC(p) << 3, facilitynames),
+ getcodetext(LOG_PRI(p), prioritynames),
+ (blobmsg_get_u32(tb[LOG_SOURCE])) ? ("") : (" kernel:"), m);
+ ret = write(sender.fd, buf, strlen(buf));
}
- free(str);
if (log_type == LOG_FILE)
fsync(sender.fd);
- return 0;
+ return ret;
}
-static void follow_log(struct ubus_context *ctx, int id)
+static int usage(const char *prog)
{
- FILE *fp;
- int ret;
+ fprintf(stderr, "Usage: %s [options]\n"
+ "Options:\n"
+ " -s <path> Path to ubus socket\n"
+ " -l <count> Got only the last 'count' messages\n"
+ " -e <pattern> Filter messages with a regexp\n"
+ " -r <server> <port> Stream message to a server\n"
+ " -F <file> Log file\n"
+ " -S <bytes> Log size\n"
+ " -p <file> PID file\n"
+ " -h <hostname> Add hostname to the message\n"
+ " -P <prefix> Prefix custom text to streamed messages\n"
+ " -f Follow log messages\n"
+ " -u Use UDP as the protocol\n"
+ " -t Add an extra timestamp\n"
+ " -0 Use \\0 instead of \\n as trailer when using TCP\n"
+ "\n", prog);
+ return 1;
+}
- signal(SIGPIPE, SIG_IGN);
+static void logread_fd_data_cb(struct ustream *s, int bytes)
+{
+ while (true) {
+ struct blob_attr *a;
+ int len, cur_len;
- if (pid_file) {
- fp = fopen(pid_file, "w+");
- if (fp) {
- fprintf(fp, "%d", getpid());
- fclose(fp);
- }
+ a = (void*) ustream_get_read_buf(s, &len);
+ if (len < sizeof(*a))
+ break;
+
+ cur_len = blob_len(a) + sizeof(*a);
+ if (len < cur_len)
+ break;
+
+ log_notify(a);
+ ustream_consume(s, cur_len);
}
+}
- uloop_init();
- ubus_add_uloop(ctx);
+static void logread_fd_state_cb(struct ustream *s)
+{
+ if (log_follow)
+ logd_conn_tries = LOGD_CONNECT_RETRY;
+ uloop_end();
+}
+
+static void logread_fd_cb(struct ubus_request *req, int fd)
+{
+ static struct ustream_fd test_fd;
- log_event.remove_cb = log_handle_remove;
- log_event.cb = log_notify;
- ret = ubus_register_subscriber(ctx, &log_event);
- if (ret)
- fprintf(stderr, "Failed to add watch handler: %s\n", ubus_strerror(ret));
+ memset(&test_fd, 0, sizeof(test_fd));
- ret = ubus_subscribe(ctx, &log_event, id);
- if (ret)
- fprintf(stderr, "Failed to add watch handler: %s\n", ubus_strerror(ret));
+ 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_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));
+ fprintf(stderr, "failed to open %s: %m\n", log_file);
exit(-1);
}
} else {
sender.fd = STDOUT_FILENO;
}
-
- uloop_run();
- ubus_free(ctx);
- uloop_done();
-}
-
-enum {
- READ_LINE,
- __READ_MAX
-};
-
-
-
-static const struct blobmsg_policy read_policy[] = {
- [READ_LINE] = { .name = "lines", .type = BLOBMSG_TYPE_ARRAY },
-};
-
-static void read_cb(struct ubus_request *req, int type, struct blob_attr *msg)
-{
- struct blob_attr *cur;
- struct blob_attr *_tb[__READ_MAX];
- time_t t;
- int rem;
-
- if (!msg)
- return;
-
- blobmsg_parse(read_policy, ARRAY_SIZE(read_policy), _tb, blob_data(msg), blob_len(msg));
- if (!_tb[READ_LINE])
- return;
- blobmsg_for_each_attr(cur, _tb[READ_LINE], rem) {
- struct blob_attr *tb[__LOG_MAX];
- uint32_t p;
- char *c;
-
- if (blobmsg_type(cur) != BLOBMSG_TYPE_TABLE)
- continue;
-
- blobmsg_parse(log_policy, ARRAY_SIZE(log_policy), tb, blobmsg_data(cur), blobmsg_data_len(cur));
- if (!tb[LOG_MSG] || !tb[LOG_ID] || !tb[LOG_PRIO] || !tb[LOG_SOURCE] || !tb[LOG_TIME])
- continue;
-
- t = blobmsg_get_u64(tb[LOG_TIME]);
- p = blobmsg_get_u32(tb[LOG_PRIO]);
- c = ctime(&t);
- c[strlen(c) - 1] = '\0';
-
- printf("%s %s.%s%s %s\n",
- c, getcodetext(LOG_FAC(p) << 3, facilitynames), getcodetext(LOG_PRI(p), prioritynames),
- (blobmsg_get_u32(tb[LOG_SOURCE])) ? ("") : (" kernel:"),
- blobmsg_get_string(tb[LOG_MSG]));
- }
-}
-
-static int usage(const char *prog)
-{
- fprintf(stderr, "Usage: %s [options]\n"
- "Options:\n"
- " -s <path> Path to ubus socket\n"
- " -l <count> Got only the last 'count' messages\n"
- " -r <server> <port> Stream message to a server\n"
- " -F <file> Log file\n"
- " -S <bytes> Log size\n"
- " -p <file> PID file\n"
- " -h <hostname> Add hostname to the message\n"
- " -P <prefix> Prefix custom text to streamed messages\n"
- " -f Follow log messages\n"
- " -u Use UDP as the protocol\n"
- "\n", prog);
- return 1;
}
int main(int argc, char **argv)
struct ubus_context *ctx;
uint32_t id;
const char *ubus_socket = NULL;
- int ch, ret, subscribe = 0, lines = 0;
+ int ch, ret, lines = 0;
static struct blob_buf b;
- while ((ch = getopt(argc, argv, "ufcs:l:r:F:p:S:P:h:")) != -1) {
+ signal(SIGPIPE, SIG_IGN);
+
+ while ((ch = getopt(argc, argv, "u0fcs:l:r:F:p:S:P:h:e:t")) != -1) {
switch (ch) {
case 'u':
log_udp = 1;
break;
+ case '0':
+ log_trailer_null = 1;
+ break;
case 's':
ubus_socket = optarg;
break;
log_prefix = optarg;
break;
case 'f':
- subscribe = 1;
+ log_follow = 1;
break;
case 'l':
lines = atoi(optarg);
case 'h':
hostname = optarg;
break;
+ case 'e':
+ if (!regcomp(®exp_preg, optarg, REG_NOSUB)) {
+ regexp_pattern = optarg;
+ }
+ break;
+ case 't':
+ log_timestamp = 1;
+ break;
default:
return usage(*argv);
}
}
+ uloop_init();
ctx = ubus_connect(ubus_socket);
if (!ctx) {
fprintf(stderr, "Failed to connect to ubus\n");
return -1;
}
+ ubus_add_uloop(ctx);
- ret = ubus_lookup_id(ctx, "log", &id);
- if (ret)
- fprintf(stderr, "Failed to find log object: %s\n", ubus_strerror(ret));
-
- if (!subscribe || lines) {
- blob_buf_init(&b, 0);
- if (lines)
- blobmsg_add_u32(&b, "lines", lines);
- ubus_invoke(ctx, id, "read", b.head, read_cb, 0, 3000);
+ if (log_follow && pid_file) {
+ FILE *fp = fopen(pid_file, "w+");
+ if (fp) {
+ fprintf(fp, "%d", getpid());
+ fclose(fp);
+ }
}
- if (subscribe)
- follow_log(ctx, id);
+ 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;
+ }
+ 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();
+
+ } while (logd_conn_tries--);
+
+ ubus_free(ctx);
+ uloop_done();
+
+ if (log_follow && pid_file)
+ unlink(pid_file);
- return 0;
+ return ret;
}
projects / project / ubox.git / blobdiff