Revision a0fdbd1d
Added by NOYB NOYB over 9 years ago
| src/etc/inc/filter_log.inc | ||
|---|---|---|
| 113 | 113 |
|
| 114 | 114 |
$date_pattern = "\(" . $month_pattern . "\ +" . $day_pattern . "\ +" . $time_pattern . "\)";
|
| 115 | 115 |
|
| 116 |
$process_pattern = "\(.*?\)"; |
|
| 117 |
$pid_pattern = "\(.*?\)\(?::\ +\)?\(?:\[[0-9:]*\]\)?:?"; |
|
| 116 |
$host_pattern = "\(.*?\)"; |
|
| 117 |
# $host_pattern = "\([a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]\)"; |
|
| 118 |
|
|
| 119 |
$process_pattern = "\(.*?\)\(?::\ +\)?"; |
|
| 120 |
$pid_pattern = "\(?:\[[0-9:]*\]\)?:?"; |
|
| 121 |
$process_pid_pattern = $process_pattern . $pid_pattern; |
|
| 122 |
|
|
| 118 | 123 |
$log_message_pattern = "\(.*\)"; |
| 119 | 124 |
|
| 120 |
$pattern = "^" . $date_pattern . "\ +" . $process_pattern . "\ +" . $pid_pattern . "\ +" . $log_message_pattern . "$";
|
|
| 125 |
$pattern = "^" . $date_pattern . "\ +" . $host_pattern . "\ +" . $process_pid_pattern . "\ +" . $log_message_pattern . "$";
|
|
| 121 | 126 |
} |
| 122 | 127 |
else if ($logfile_type == 'tbd') {
|
| 123 | 128 |
$pattern = "^\(.*\)$"; |
| ... | ... | |
| 265 | 270 |
|
| 266 | 271 |
$date_pattern = "(" . $month_pattern . "\ +" . $day_pattern . "\ +" . $time_pattern . ")";
|
| 267 | 272 |
|
| 268 |
$process_pattern = "(.*?)"; |
|
| 269 |
$pid_pattern = "(.*?)(?::\ +)?(?:\[([0-9:]*)\])?:?"; |
|
| 273 |
$host_pattern = "(.*?)"; |
|
| 274 |
# $host_pattern = "([a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])"; |
|
| 275 |
|
|
| 276 |
$process_pattern = "(.*?)(?::\ +)?"; |
|
| 277 |
$pid_pattern = "(?:\[([0-9:]*)\])?:?"; |
|
| 278 |
$process_pid_pattern = $process_pattern . $pid_pattern; |
|
| 279 |
|
|
| 270 | 280 |
$log_message_pattern = "(.*)"; |
| 271 | 281 |
|
| 272 |
$pattern = "/^" . $date_pattern . "\ +" . $process_pattern . "\ +" . $pid_pattern . "\ +" . $log_message_pattern . "$/";
|
|
| 282 |
$pattern = "/^" . $date_pattern . "\ +" . $host_pattern . "\ +" . $process_pid_pattern . "\ +" . $log_message_pattern . "$/";
|
|
| 273 | 283 |
|
| 274 | 284 |
if (!preg_match($pattern, $line, $log_split)) {
|
| 275 | 285 |
return ""; |
Also available in: Unified diff
Tweak for correct var naming , so that:
process_pattern var actually holds the process pattern instead of the host name pattern.
pid_pattern var actually holds the pid pattern instead of the process and pid patterns.
No functional changes. Just good to have the var names reflect what they really hold.