dan
/
liminix
1
0
Fork 5
Code Issues 2 Pull Requests 1 Projects Releases Wiki Activity

extract method is_connected

This commit is contained in:
Daniel Barlow 2024-09-15 21:40:05 +01:00
parent 8ec00f1710
commit 1f6cfc3679
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/logshipper/logtee.c
View File

@ -38,6 +38,10 @@ struct pollfd fds[] = {
{ .fd = -1, .events = POLLERR }, { .fd = -1, .events = POLLERR },
}; };
int is_connected(void) {
return (fds[2].fd >= 0);
}
int main(int argc, char * argv[]) { int main(int argc, char * argv[]) {
@ -67,7 +71,7 @@ int main(int argc, char * argv[]) {
if(out_bytes == 0) { if(out_bytes == 0) {
exit(0); exit(0);
}; };
if(fds[2].fd >= 0) tee_bytes = out_bytes; if(is_connected()) tee_bytes = out_bytes;
}; };
if(out_bytes) { if(out_bytes) {
@ -76,7 +80,7 @@ int main(int argc, char * argv[]) {
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(fds[2].fd >= 0) { 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);
}; };
@ -87,7 +91,7 @@ int main(int argc, char * argv[]) {
}; };
}; };
} else { } else {
if(fds[2].fd < 0) { if(! is_connected()) {
if(argc>1) fds[2].fd = open_shipper_socket(argv[1]); if(argc>1) fds[2].fd = open_shipper_socket(argv[1]);
} }
}; };