dan/liminix
1
0
Fork 5
Code

logtap: fix indentation

Browse Source 
spaces not tabs
This commit is contained in:
Daniel Barlow 2025-01-02 22:45:00 +00:00
parent df414b796f
commit aa2160dd05
1 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
pkgs/logshipper/logtap.c
View File

@ -35,24 +35,24 @@ int open_shipper_socket(char *pathname) {
static int fail_count = 0; static int fail_count = 0;
struct sockaddr_un sa = { struct sockaddr_un sa = {
.sun_family = AF_LOCAL .sun_family = AF_LOCAL
}; };
strncpy(sa.sun_path, pathname, sizeof(sa.sun_path) - 1); strncpy(sa.sun_path, pathname, sizeof(sa.sun_path) - 1);
fd = socket(AF_LOCAL, SOCK_STREAM, 0); fd = socket(AF_LOCAL, SOCK_STREAM, 0);
if(fd >= 0) { if(fd >= 0) {
if(connect(fd, (struct sockaddr *) &sa, sizeof sa)) { if(connect(fd, (struct sockaddr *) &sa, sizeof sa)) {
if((fail_count % 30) == 0) if((fail_count % 30) == 0) {
printf(PROGRAM_NAME ": cannot connect socket \"%s\": %s\n", printf(PROGRAM_NAME ": cannot connect socket \"%s\": %s\n",
pathname, pathname,
strerror(errno)); strerror(errno));
}
fail_count++; fail_count++;
close(fd); close(fd);
return -1; return -1;
} }
int flags = fcntl(fd, F_GETFL); int flags = fcntl(fd, F_GETFL);
fcntl(fd, F_SETFL, flags | O_NONBLOCK); fcntl(fd, F_SETFL, flags | O_NONBLOCK);
} }
return fd; return fd;
} }
@ -75,7 +75,7 @@ int main(int argc, char * argv[]) {
int tee_bytes = 0; int tee_bytes = 0;
if(argc != 3) { if(argc != 3) {
error(1, 0, "usage: " PROGRAM_NAME " /path/to/socket cookie-text"); error(1, 0, "usage: " PROGRAM_NAME " /path/to/socket cookie-text");
} }
char * socket_pathname = argv[1]; char * socket_pathname = argv[1];
char * cookie = argv[2]; char * cookie = argv[2];
@ -83,8 +83,8 @@ int main(int argc, char * argv[]) {
char * stop_cookie = malloc(strlen(cookie) + 7); char * stop_cookie = malloc(strlen(cookie) + 7);
if(strlen(socket_pathname) > 108) { if(strlen(socket_pathname) > 108) {
error(1, 0, "socket pathname \"%s\" is too long, max 108 bytes", error(1, 0, "socket pathname \"%s\" is too long, max 108 bytes",
socket_pathname); socket_pathname);
}; };
strcpy(start_cookie, cookie); strcat(start_cookie, " START\n"); strcpy(start_cookie, cookie); strcat(start_cookie, " START\n");
@ -97,46 +97,46 @@ int main(int argc, char * argv[]) {
int quitting = 0; int quitting = 0;
while(! quitting) { while(! quitting) {
int nfds = poll(fds, 3, 2000); int nfds = poll(fds, 3, 2000);
if(nfds > 0) { if(nfds > 0) {
if((fds[0].revents & (POLLIN|POLLHUP)) && if((fds[0].revents & (POLLIN|POLLHUP)) &&
(out_bytes == 0) && (out_bytes == 0) &&
(tee_bytes == 0)) { (tee_bytes == 0)) {
out_bytes = read(fds[0].fd, buf, 8192); out_bytes = read(fds[0].fd, buf, 8192);
if(out_bytes == 0) { if(out_bytes == 0) {
quitting = 1; quitting = 1;
buf = PROGRAM_NAME " detected eof of file on stdin, exiting\n"; buf = PROGRAM_NAME " detected eof of file on stdin, exiting\n";
out_bytes = strlen(buf); out_bytes = strlen(buf);
}; };
if(is_connected()) tee_bytes = out_bytes; if(is_connected()) tee_bytes = out_bytes;
}; };
if(out_bytes) { if(out_bytes) {
out_bytes -= write(fds[1].fd, buf, out_bytes); out_bytes -= write(fds[1].fd, buf, out_bytes);
}; };
if(fds[1].revents & (POLLERR|POLLHUP)) { if(fds[1].revents & (POLLERR|POLLHUP)) {
exit(1); // can't even log an error if the logging stream fails exit(1); // can't even log an error if the logging stream fails
}; };
if(is_connected()) { if(is_connected()) {
if(tee_bytes) { if(tee_bytes) {
tee_bytes -= write(fds[2].fd, buf, tee_bytes); tee_bytes -= write(fds[2].fd, buf, tee_bytes);
}; };
if(fds[2].revents & (POLLERR|POLLHUP)) { if(fds[2].revents & (POLLERR|POLLHUP)) {
close(fds[2].fd); close(fds[2].fd);
fds[2].fd = -1; fds[2].fd = -1;
(void) write(1, stop_cookie, strlen(stop_cookie)); (void) write(1, stop_cookie, strlen(stop_cookie));
}; };
}; };
} else { } else {
if(! is_connected()) { if(! is_connected()) {
fds[2].fd = open_shipper_socket(argv[1]); fds[2].fd = open_shipper_socket(argv[1]);
if(is_connected()) { if(is_connected()) {
/* write cookie to stdout so that the backfill /* write cookie to stdout so that the backfill
* process knows we are now logging realtime * process knows we are now logging realtime
*/ */
write(fds[1].fd, start_cookie, strlen(start_cookie)); write(fds[1].fd, start_cookie, strlen(start_cookie));
} }
} }
}; };
}; };
} }