sebres
8cb4ae0242
Code review and small optimizations, prepared to provide offset-based time zones for date-detectors (parsing of input-string)
2017-06-09 13:55:30 +02:00
Georges Racinet
e8f2173904
New logtimezone jail option
...
This new option allows to force the time zone on log lines
that don't bear a time zone indication (GitHub issue #1773 ), so it behaves
actually with respect to log line contents as a default time zone.
For the time being, only fixed offset timezones (UTC or UTC[+-]hhmm) are
supported, but the implementation is designed to later on treat the case
of logical timezones with DST, e.g., Europe/Paris etc.
In particular, the timezone name gets passed all the way to the strptime
module, and the resulting offset is computed for the given log line, even
though for now, it doesn't actually depend on it.
Also, the DateTemplate subclass gets to choose whether to use it or not.
For instance, it doesn't make sense to apply a time zone offset to
Unix timestamps.
The drawback is to introduce an API change for DateTemplate. I hope it's
internal enough for that not being a problem.
2017-05-23 17:39:37 +02:00
sebres
2b08847f3a
Reintegrate 'master' into 0.10 (merge point) + small code review
2017-05-19 16:32:13 +02:00
sebres
c7ddf1f940
[systemd-backend] implicit closing journal descriptor by stop filter.
...
Partially cherry-picked from 0.10 (d153555a07
2017-05-19 15:36:06 +02:00
sebres
ae0f0d2ec0
Merge branch 'fix-pyinotify-dir-rotate' into 0.10
2017-05-19 13:39:19 +02:00
sebres
96c3b06abb
amend to #1778 : repair notifier wait-cycle (too long timeout in polling, too late check for pending files, too long stop)
2017-05-19 13:26:16 +02:00
sebres
9b83a3128d
code review, try to increase coverage
2017-05-17 12:23:28 +02:00
Serg G. Brester
17b0945a70
Update ChangeLog
2017-05-16 09:43:52 +02:00
Serg G. Brester
a73b0c0064
Merge pull request #1778 from sebres/fix-pyinotify-dir-rotate
...
Fix pyinotify directory-based log-rotate
2017-05-16 09:41:09 +02:00
sebres
050076ae42
code review + coverage fixes
2017-05-15 19:05:40 +02:00
sebres
62e580b7cf
pyinotify: switch from ThreadedNotifier to Notifier:
...
- Filter instance is already a thread;
- avoid stop pyinotify processing if an interim error occurs (and breaks main-loop, e. g. during multi-threaded processing by add/remove log-files)
2017-05-15 18:47:00 +02:00
sebres
c258bb4a6a
Merge branch '0.10' into fix-pyinotify-dir-rotate
2017-05-15 16:50:17 +02:00
sebres
94c793ff89
Merge branch 'master' into 0.10
2017-05-15 16:48:11 +02:00
sebres
0a707d0302
Merge branch 'travis-fix-pypy'
2017-05-15 16:41:22 +02:00
sebres
f099558bcf
try to fix travis build for pypy3 (after switch to 'pypy3.3-5.2-alpha1' the test cases seems to never run anymore).
2017-05-15 16:32:41 +02:00
sebres
16a84ca0b5
code review
2017-05-15 15:20:43 +02:00
Filippo Tessarotto
ff1c6718da
Postfix RBL: 554 & SMTP
...
Cherry-pick of 607568f5da
2017-05-15 14:42:37 +02:00
sebres
5c1d01bf58
code review, try to make recognition of pending files fewer sporadic (error prone)
2017-05-15 14:31:50 +02:00
sebres
9841fe52c3
fixed cleanup for Gamin backend (by interim stop in the test-cases)
2017-05-15 12:52:16 +02:00
sebres
7b614a7a15
differentiate between watched directories and files (refreshing monitoring of files/dirs expected different flags for watcher)
2017-05-15 12:38:48 +02:00
sebres
e340d0d2b2
Fixed detection of directory-based log-rotation of pyinotify backend.
...
If directory moved and the target is not watched path, so the monitoring of it could not be continued.
Now fixed with pending files await a monitoring if there (resp. its directories) appears again (respawn).
Closes gh-1769
2017-05-12 16:51:08 +02:00
Yaroslav Halchenko
407b2ea936
life is going on
2017-05-11 11:17:27 -04:00
Yaroslav Halchenko
bc60d6feb6
Merge remote-tracking branch 'origin/master'
...
* origin/master:
exim test cases extended: cover short form of the logging (without session-id, gh-1771)
2017-05-11 11:13:07 -04:00
sebres
31627b796b
Merge branch 'master' into 0.10
2017-05-11 09:14:52 +02:00
sebres
a5cdb9c977
exim test cases extended: cover short form of the logging (without session-id, gh-1771)
2017-05-11 09:10:45 +02:00
Yaroslav Halchenko
35280044ff
Preparing for 0.9.7 release
2017-05-10 21:38:57 -04:00
Yaroslav Halchenko
663d526d74
Added newly added files to MANIFEST
2017-05-10 21:31:09 -04:00
Serg G. Brester
c43a3ac1cd
Merge pull request #1770 from tjikkun/double_lock
...
resolves deadlock (dual lock) by SYSLOG logging type
2017-05-08 14:56:39 +02:00
Sander Hoentjen
2a4dafce5b
don't call setLogTarget from setSyslogSocket when holding the lock
...
If we do, setLogTarget will wait for the lock, but it will never be released
2017-05-08 14:11:07 +02:00
sebres
b13d9d4e22
Merge branch 'master' into 0.10
2017-05-07 21:29:12 +02:00
sebres
bea3a62a37
update ChangeLog
2017-05-07 14:02:45 +02:00
sebres
0600d51511
filter.d/exim.conf: added new reason for "rejected RCPT" regex: Unrouteable address
2017-05-07 14:02:38 +02:00
sebres
49e237209e
Merge branch 'master' into 0.10
2017-05-07 13:32:12 +02:00
sebres
3d64d705f3
try to fix travis integration of pypy3: setuptools recently dropped support for Python 3.0 - 3.2, but old pypy3 based on Python 3.2.5
2017-05-07 13:28:35 +02:00
sebres
c546f85207
filter.d/exim.conf: cherry-picked from 0.10, match complex time like D=2m42s (closes gh-1766)
2017-05-07 13:02:32 +02:00
Seth Reeser
c3426ba5f6
Update botsearch-common.conf ( #1759 )
...
* Update botsearch-common.conf, apache-modsecurity.conf: typo and missing new-line
2017-04-26 20:14:39 +02:00
sebres
8839bcbb09
Merge remote-tracking branch master into 0.10
2017-04-25 10:07:19 +02:00
Serg G. Brester
fafe11d326
Merge pull request #1757 from sebres/0.9-fix-gh-1751
...
filter.d/exim.conf: optional part `(...)` by authenticator failed for ...
2017-04-25 10:05:27 +02:00
sebres
462442a517
Update ChangeLog #1757
2017-04-25 10:04:45 +02:00
Serg G. Brester
e7d51d1969
Merge pull request #1758 from sebres/0.10-new-hostname-tags
...
0.10 new action tags: <fq-hostname>, <sh-hostname>
2017-04-25 09:59:26 +02:00
sebres
e4ccbe7286
code review: getHostname can return ''
2017-04-24 21:32:40 +02:00
sebres
f75c3d8a02
code review and ChangeLog entry
2017-04-24 21:18:16 +02:00
sebres
db16b4c22a
testComplexMailActionMultiLog: better echo mock-up replacement for "...) | mail -s ..."
2017-04-24 21:18:14 +02:00
sebres
99344d28c8
Introduces new tags with hostname:
...
- `<fq-hostname>` - fully-qualified name of host (the same as `$(hostname -f)`)
- `<sh-hostname>` - short hostname (the same as `$(uname -n)`)
Execution of `uname -n` replaced in all mail actions with most interesting fully-qualified `<fq-hostname>`.
2017-04-24 21:17:55 +02:00
sebres
3161bcf78b
filter.d/exim.conf: optional part (...) after host-name before [IP], normalized over whole config file.
...
# Conflicts:
# config/filter.d/exim.conf
2017-04-24 19:21:26 +02:00
sebres
507034c5be
filter.d/apache-auth.conf: joined some similar expressions
2017-04-24 15:32:44 +02:00
Serg G. Brester
e35ed1cdf7
Update ChangeLog
...
Changes of #1645
2017-04-21 11:24:32 +02:00
Serg G. Brester
6dfd080e20
Update apache-auth.conf
...
remove forgotten referer, that may prevent failure recognition (belongs to gh-1645)
2017-04-21 11:17:13 +02:00
Serg G. Brester
dffda63d59
Merge pull request #1645 from benrubson/issue1644
...
Apache URIs can contain spaces
2017-04-21 10:47:12 +02:00
Serg G. Brester
311f8fea83
Merge branch '0.10' into issue1644
2017-04-21 10:32:29 +02:00
