parser.h (goaccess-1.7.1) | : | parser.h (goaccess-1.7.2) | ||
---|---|---|---|---|
skipping to change at line 57 | skipping to change at line 57 | |||
#define ERR_SPEC_TOKN_NUL 0x1 | #define ERR_SPEC_TOKN_NUL 0x1 | |||
#define ERR_SPEC_TOKN_INV 0x2 | #define ERR_SPEC_TOKN_INV 0x2 | |||
#define ERR_SPEC_SFMT_MIS 0x3 | #define ERR_SPEC_SFMT_MIS 0x3 | |||
#define ERR_SPEC_LINE_INV 0x4 | #define ERR_SPEC_LINE_INV 0x4 | |||
#define ERR_LOG_NOT_FOUND 0x5 | #define ERR_LOG_NOT_FOUND 0x5 | |||
#define ERR_LOG_REALLOC_FAILURE 0x6 | #define ERR_LOG_REALLOC_FAILURE 0x6 | |||
#include "commons.h" | #include "commons.h" | |||
#include "gslist.h" | #include "gslist.h" | |||
typedef struct GLogProp_ { | ||||
char *filename; /* filename including path */ | ||||
char *fname; /* basename(filename) */ | ||||
uint64_t inode; /* inode of the log */ | ||||
uint64_t size; /* original size of log */ | ||||
} GLogProp; | ||||
/* Log properties. Note: This is per line parsed */ | /* Log properties. Note: This is per line parsed */ | |||
typedef struct GLogItem_ { | typedef struct GLogItem_ { | |||
char *agent; | char *agent; | |||
char *browser; | char *browser; | |||
char *browser_type; | char *browser_type; | |||
char *continent; | char *continent; | |||
char *country; | char *country; | |||
char *asn; | char *asn; | |||
char *date; | char *date; | |||
char *host; | char *host; | |||
skipping to change at line 121 | skipping to change at line 128 | |||
uint64_t size; | uint64_t size; | |||
uint16_t snippetlen; | uint16_t snippetlen; | |||
char snippet[READ_BYTES + 1]; | char snippet[READ_BYTES + 1]; | |||
} GLastParse; | } GLastParse; | |||
/* Overall parsed log properties */ | /* Overall parsed log properties */ | |||
typedef struct GLog_ { | typedef struct GLog_ { | |||
uint8_t piping:1; | uint8_t piping:1; | |||
uint8_t log_erridx; | uint8_t log_erridx; | |||
uint32_t read; /* lines read/parsed */ | uint32_t read; /* lines read/parsed */ | |||
uint64_t inode; /* inode of the log */ | ||||
uint64_t bytes; /* bytes read on each iteration */ | uint64_t bytes; /* bytes read on each iteration */ | |||
uint64_t size; /* original size of log */ | ||||
uint64_t length; /* length read from the log so far */ | uint64_t length; /* length read from the log so far */ | |||
uint64_t invalid; /* invalid lines for this log */ | uint64_t invalid; /* invalid lines for this log */ | |||
uint64_t processed; /* lines proceeded for this log */ | uint64_t processed; /* lines proceeded for this log */ | |||
/* file test for persisted/restored data */ | /* file test for persisted/restored data */ | |||
uint16_t snippetlen; | uint16_t snippetlen; | |||
char snippet[READ_BYTES + 1]; | char snippet[READ_BYTES + 1]; | |||
GLogItem *items; | GLogItem *items; | |||
GLastParse lp; | GLastParse lp; | |||
GLogProp props; | ||||
char *filename; | ||||
char *fname; /* basename(filename) */ | ||||
char *fname_as_vhost; | char *fname_as_vhost; | |||
char **errors; | char **errors; | |||
FILE *pipe; | FILE *pipe; | |||
} GLog; | } GLog; | |||
/* Container for all logs */ | /* Container for all logs */ | |||
typedef struct Logs_ { | typedef struct Logs_ { | |||
uint8_t restored:1; | uint8_t restored:1; | |||
uint8_t load_from_disk_only:1; | uint8_t load_from_disk_only:1; | |||
End of changes. 5 change blocks. | ||||
4 lines changed or deleted | 8 lines changed or added |