Rainer Gerhards
aaf87ae4ec
Merge branch 'v8-stable-backgrounding'
2014-10-22 17:12:31 +02:00
Rainer Gerhards
a534d6a165
maintain ChangeLog
2014-10-22 15:45:38 +02:00
Rainer Gerhards
2b94ec3069
Merge branch 'master-imfile'
2014-10-22 15:44:16 +02:00
Rainer Gerhards
d1e7d71838
imfile: add "deletestateonfiledelete" config parameter
2014-10-22 14:13:15 +02:00
Rainer Gerhards
0f164bf746
imfile: handle wildcards correctly *on startup*
2014-10-22 12:55:44 +02:00
Rainer Gerhards
385fde7442
imfile: better wildcard detection
2014-10-21 17:26:52 +02:00
Rainer Gerhards
e5e7836be2
imfile: simplifications thanks to better use of inotify events
2014-10-21 16:10:45 +02:00
Rainer Gerhards
ef9fad056f
imfile: milestone: file is picked up again after being deleted
2014-10-21 16:00:02 +02:00
Rainer Gerhards
e53d6114d8
imfile: deprecate "statefile" parameter
...
also fix some issues that resulted from a partial previous commit
2014-10-21 14:14:29 +02:00
Rainer Gerhards
a338a21d20
add capability to deprecate config parameters in config handler
2014-10-21 14:13:55 +02:00
Rainer Gerhards
7cf1349a17
imfile: better messages when state file cannot be read
2014-10-21 14:06:28 +02:00
Rainer Gerhards
e73b841313
imfile: add support for dynamic state files
2014-10-21 12:48:55 +02:00
Rainer Gerhards
55946fc682
Merge branch 'v8-stable'
2014-10-21 12:06:14 +02:00
Rainer Gerhards
c0b599bbe8
maintain ChangeLog
2014-10-21 12:05:51 +02:00
Rainer Gerhards
f318b30571
imfile: could make rsyslog exit if in inotify mode
2014-10-21 12:05:21 +02:00
Rainer Gerhards
f63d5ed44f
imfile: could make rsyslog exit if in inotify mode
2014-10-21 12:04:27 +02:00
Rainer Gerhards
2cd1bd9169
Merge branch 'v7-stable-backgrounding' into v8-stable-backgrounding
...
Conflicts:
tools/rsyslogd.c
2014-10-21 11:29:52 +02:00
Rainer Gerhards
af67e7f129
fix problems with last commit, add timeout capability
...
also a bit of cleanup of no longer needed code
2014-10-21 11:23:48 +02:00
Rainer Gerhards
0bd923e552
first shot at auto-backgrounding by using a pipe instead of signals
2014-10-20 12:10:00 +02:00
Rainer Gerhards
fd7ab1ee8d
imfile: more refactoring and fix invalid mem access in new code
2014-10-17 15:37:21 +02:00
Rainer Gerhards
d11858def1
imfile: refactor "files" array to use doubly-linked list
...
The array did not support dynamic file monitors as they happen
when wildcards are supported. While of course we could have found
a way to make this work with the array, this would not have been
a proper solution - much more complex than needed. So we solve
this by using a doubly linked list.
2014-10-17 14:40:33 +02:00
Rainer Gerhards
36f373bea1
imfile: milestone: simplify delete code
...
Unfortunately, this still does not work. It's hard to kepp the
approch with tables over to dynamic cases (and confusing). As such,
we intend to refactor this in the next step.
2014-10-16 17:54:51 +02:00
Rainer Gerhards
dcd1935840
imfile: more consitent var naming plus enhanced delete processing
...
The code tries now to obtain more data from a deleted file before
it is purged from our own tables. If we are lucky, we still hold
a handle to the open inode.
2014-10-16 12:08:51 +02:00
Rainer Gerhards
25baf0e1fa
imfile: support for DELETE file notification
2014-10-16 11:55:56 +02:00
Rainer Gerhards
68ac87cb8a
imfile: basically, wildcards are working
...
still work to do, e.g. the whole cleanup of wildcard-created
file entries is not yet done.
2014-10-15 15:44:36 +02:00
Rainer Gerhards
c9c6bd47d6
imfile: non-wildcard file is read on creation even if it were not present at startup
...
see also https://github.com/rsyslog/rsyslog/issues/137
2014-10-15 12:55:04 +02:00
Rainer Gerhards
7ca5b1e571
imfile: refactor active file table
2014-10-15 12:32:23 +02:00
Rainer Gerhards
0bbf1454a9
Merge branch 'master' into master-imfile
2014-10-15 11:50:53 +02:00
Rainer Gerhards
de42fb4897
bugfix: imfile did not complain if configured file did not exist
...
closes https://github.com/rsyslog/rsyslog/issues/137
2014-10-15 11:42:07 +02:00
Rainer Gerhards
9a44568c9f
imfile: more naming refactoring
2014-10-15 11:31:29 +02:00
Rainer Gerhards
f29ab45c69
imfile: refactor naming
2014-10-15 11:28:28 +02:00
Rainer Gerhards
3b7bee68fc
Merge branch 'v8-stable'
2014-10-13 15:44:36 +02:00
Rainer Gerhards
503d75050b
bugfix imfile:file processing in inotify mode was stalled sometimes
...
closes https://github.com/rsyslog/rsyslog/issues/134
2014-10-13 15:44:10 +02:00
Rainer Gerhards
054fab8c0c
datatype for pri in parser.c was left at unsigned, now use dedicated one
2014-10-09 13:24:33 +02:00
Rainer Gerhards
948bc571a3
Merge branch 'v8-stable'
2014-10-09 08:23:46 +02:00
Rainer Gerhards
8bf43525fe
bugfix imfile: segfault on startup in "inotify" mode
...
A segfault happened when more than one file was monitored.
2014-10-09 08:22:39 +02:00
Rainer Gerhards
0cc1ef8ac8
Merge branch 'v8-stable'
...
Conflicts:
plugins/ommail/ommail.c
2014-10-08 19:06:47 +02:00
Rainer Gerhards
9da526ef5c
ChangeLog: forgotten to add proper credits
2014-10-08 15:59:29 +02:00
Rainer Gerhards
67899658bf
maintain ChangeLog
2014-10-08 15:58:09 +02:00
Rainer Gerhards
5b501968b3
ommail: remove no longer used variable
2014-10-08 15:55:57 +02:00
Paul Freeman
f262e19111
Fix only generate a single To: rfc2822 header with comma separator for
...
multiple recipients
2014-10-08 15:42:36 +02:00
Paul Freeman
5af0aabc64
Fix typo in X-Mailer: header
2014-10-08 15:42:22 +02:00
Paul Freeman
a63052b9c1
Fix Date: header to be rfc2822 compliant
2014-10-08 15:42:09 +02:00
Rainer Gerhards
b18db345a1
Merge remote-tracking branch 'github/master'
2014-10-08 15:41:33 +02:00
Rainer Gerhards
63bd0c4dc6
Merge pull request #130 from cacheus/master
...
Fixup some minor issues in ommail
2014-10-08 15:41:09 +02:00
Rainer Gerhards
2bd17e5313
imjournal: remove unnecessary header
2014-10-08 13:11:22 +02:00
Rainer Gerhards
87cef6528a
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
2014-10-08 12:50:53 +02:00
Rainer Gerhards
9895ce37f2
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
2014-10-08 12:50:25 +02:00
Rainer Gerhards
a407348963
refactor PRI-handling code
2014-10-08 12:50:10 +02:00
Rainer Gerhards
afa3128c93
Merge branch 'v8-stable'
2014-10-08 12:41:49 +02:00
