Kyoshiro/bip
1
0
Fork 0
forked from bip/bip
Code Pull Requests Activity

Backlogging code cleanup: fixes

Browse Source 
This makes the new backlogging code, actually backlog something.
This commit is contained in:
Arnaud Cornet 2009-01-09 13:24:11 +01:00
parent f1221703b0
commit 32cf2d462f
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/log.c
View File

@ -965,18 +965,29 @@ int log_backread_file(log_t *log, logstore_t *store, logfile_t *lf, list_t *res)
return 0; return 0;
} }
if (fseek(lf->file, store->file_offset, SEEK_SET)) {
mylog(LOG_ERROR, "Can't seek in %s", lf->filename);
list_add_last(res, _log_wrap(store->name,
"Error seeking in logfile"));
return 0;
}
close = 1; close = 1;
} }
buf = bip_malloc(LOGLINE_MAXLEN + 1); if (list_get_first(&store->file_group) == lf) {
mylog(LOG_DEBUG, "Seeking %s to %d", lf->filename,
store->file_offset);
if (fseek(lf->file, store->file_offset, SEEK_SET)) {
mylog(LOG_ERROR, "Can't seek in %s", lf->filename);
list_add_last(res, _log_wrap(store->name,
"Error seeking in logfile"));
return 0;
}
} else {
mylog(LOG_DEBUG, "Seeking %s to %d", lf->filename, 0);
if (fseek(lf->file, 0, SEEK_SET)) {
mylog(LOG_ERROR, "Can't seek in %s", lf->filename);
list_add_last(res, _log_wrap(store->name,
"Error seeking in logfile"));
return 0;
}
}
buf = bip_malloc(LOGLINE_MAXLEN + 1);
for(;;) { for(;;) {
if (!fgets(buf, LOGLINE_MAXLEN, lf->file)) { if (!fgets(buf, LOGLINE_MAXLEN, lf->file)) {
if (ferror(lf->file)) { if (ferror(lf->file)) {
@ -986,6 +997,11 @@ int log_backread_file(log_t *log, logstore_t *store, logfile_t *lf, list_t *res)
/* error or oef */ /* error or oef */
break; break;
} }
int slen = strlen(buf);
if (buf[slen - 1] == '\n')
buf[slen - 1] = 0;
if (slen >= 2 && buf[slen] == '\r')
buf[slen - 2] = 0;
if (buf[0] == 0 || buf[0] == '\n') if (buf[0] == 0 || buf[0] == '\n')
continue; continue;
logbr = log_beautify(log, buf, store->name); logbr = log_beautify(log, buf, store->name);