Skip to content

Fixed bug at logcollector that inhibited alerts about file reduction #848

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ddpbsd merged 2 commits into from
May 18, 2016
Merged

Fixed bug at logcollector that inhibited alerts about file reduction #848

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7248411
Fixed bug at logcollector that inhibited alerts about file reduction
vikman90 May 18, 2016
050d93a
Fixed compilation issue at Win32
vikman90 May 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/logcollector/logcollector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,14 @@ void LogCollectorStart()
time_t curr_time = 0;
char keepalive[1024];

/* To check for inode changes */
struct stat tmp_stat;

#ifndef WIN32
int int_error = 0;
struct timeval fp_timeout;
/* To check for inode changes */
struct stat tmp_stat;
#else
BY_HANDLE_FILE_INFORMATION lpFileInformation;

/* Check if we are on Windows Vista */
checkVista();
Expand Down Expand Up @@ -412,7 +413,6 @@ void LogCollectorStart()
merror("Closing the temporary file %s did not work (%d): %s", logff[i].file, errno, strerror(errno));
}
#else
BY_HANDLE_FILE_INFORMATION lpFileInformation;
HANDLE h1;

h1 = CreateFile(logff[i].file, GENERIC_READ,
Expand Down Expand Up @@ -481,10 +481,6 @@ void LogCollectorStart()
debug1("%s: DEBUG: File size reduced. %s",
ARGV0, logff[i].file);


/* Fix size so we don't alert more than once */
logff[i].size = tmp_stat.st_size;

/* Get new file */
fclose(logff[i].fp);

Expand Down Expand Up @@ -544,6 +540,13 @@ void LogCollectorStart()
continue;
}
}

/* Update file size */
#ifdef WIN32
logff[i].size = lpFileInformation.nFileSizeHigh + lpFileInformation.nFileSizeLow;
#else
logff[i].size = tmp_stat.st_size;
#endif
}
}
}
Expand Down