Robot
/
lnav
mirror of https://github.com/tstack/lnav.git
2
0
Fork 0
Code Issues Releases Wiki Activity

[tailer] some more fixes

This commit is contained in:
Timothy Stack 2021-09-17 13:14:19 -07:00
parent f5f41ffad9
commit 2f9f72762f
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tailer/tailer.looper.cc
View File

@ -752,7 +752,7 @@ void tailer::looper::host_tailer::loop_body()
SHA256_CTX shactx;
sha256_init(&shactx);
log_debug("checking offer %s[%lldd..+%lld]",
log_debug("checking offer %s[%lld..+%lld]",
local_path.c_str(), remaining_offset, remaining);
while (remaining > 0) {
auto nbytes = std::min(remaining, BUFFER_SIZE);
@ -763,6 +763,9 @@ void tailer::looper::host_tailer::loop_body()
ghc::filesystem::remove_all(local_path);
break;
}
if (bytes_read == 0) {
break;
}
sha256_update(&shactx, buffer.in(), bytes_read);
remaining -= bytes_read;
remaining_offset += bytes_read;

12
src/tailer/tailer.main.c
View File

@ -532,7 +532,7 @@ int poll_paths(struct list *path_list, struct client_path_state *root_cps)
if (curr->cps_client_file_size == 0) {
// initial state, haven't heard from client yet.
nbytes = 32 * 1024;
} else {
} else if (file_offset < curr->cps_client_file_size) {
// heard from client, try to catch up
nbytes = curr->cps_client_file_size - file_offset;
if (nbytes > sizeof(buffer)) {
@ -553,11 +553,11 @@ int poll_paths(struct list *path_list, struct client_path_state *root_cps)
int64_t remaining_offset = file_offset + bytes_read;
SHA256_CTX shactx;
if (curr->cps_client_file_size > 0) {
if (curr->cps_client_file_size > 0 && file_offset < curr->cps_client_file_size) {
remaining = curr->cps_client_file_size - file_offset - bytes_read;
}
fprintf(stderr, "info: prepping initial offer: remaining=%zu\n", remaining);
fprintf(stderr, "info: prepping offer: init=%ld; remaining=%zu; %s\n", bytes_read, remaining, curr->cps_path);
sha256_init(&shactx);
sha256_update(&shactx, buffer, bytes_read);
while (remaining > 0) {
@ -592,7 +592,7 @@ int poll_paths(struct list *path_list, struct client_path_state *root_cps)
TPPT_INT64,
(int64_t) st.st_mtime,
TPPT_INT64, file_offset,
TPPT_INT64, bytes_read,
TPPT_INT64, (int64_t) bytes_read,
TPPT_HASH, hash,
TPPT_DONE);
curr->cps_client_state = CS_OFFERED;
@ -1021,10 +1021,10 @@ int main(int argc, char *argv[])
if (cps == NULL) {
fprintf(stderr, "warning: unknown path in block packet: %s\n", path);
} else if (type == TPT_NEED_BLOCK) {
// fprintf(stderr, "info: client is tailing: %s\n", path);
fprintf(stderr, "info: client is tailing: %s\n", path);
cps->cps_client_state = CS_TAILING;
} else if (type == TPT_ACK_BLOCK) {
// fprintf(stderr, "info: client acked: %s\n", path);
fprintf(stderr, "info: client acked: %s %zu\n", path, client_size);
if (cps->cps_client_file_read_length == 0) {
cps->cps_client_state = CS_TAILING;
} else {