David Calavera
1c0d76c749
Add support for syslog over TLS.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4b98193beab00bc6cf48762858570a1bd418c9ef
Component: engine
2016-01-11 12:25:34 -05:00
Philip Monroe
bd692d4b30
log driver - add ability to interpolate container context into the log tag field
...
Signed-off-by: Philip Monroe <phil@philmonroe.com >
Upstream-commit: 3be7146e14d1f5ced470c0c7e3066f091f468696
Component: engine
2015-09-16 15:19:28 -07:00
Alexander Morozov
03328caba1
Check syslog config on daemon start
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 960791ba60621ef2b182379e7b237e681b602694
Component: engine
2015-08-17 14:29:45 -07:00
Alexander Morozov
acbee0eb90
Do not allow corrupted syslog-address
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b7a6d14bdc56e9397be8c9bef9c3d991ff30fe77
Component: engine
2015-08-17 14:19:06 -07:00
Morgan Bauer
90287c6171
golint fixes for daemon/logger/*
...
- downcase and privatize exported variables that were unused
- make accurate an error message
- added package comments
- remove unused var ReadLogsNotSupported
- enable linter
- some spelling corrections
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: ccbe539e86dfbb8749c09763ddfd73bf10ac57cc
Component: engine
2015-07-29 13:09:39 -07:00
wlan0
fb988a52e9
add support for maximum log size, and max number of log files
...
Signed-off-by: wlan0 <sidharthamn@gmail.com >
Upstream-commit: 9b782d3af322bd8d9cf857d63eb7f2e0fe484c90
Component: engine
2015-07-02 06:26:06 -07:00
Dennis Docter
f157b240b8
Add --log-opt to specify facility for syslog driver
...
Signed-off-by: Dennis Docter <dennis@d23.nl >
Upstream-commit: 609e7b0a55d4082fce40eabae3a06ca57c188ba5
Component: engine
2015-06-23 14:04:25 +02:00
Alexander Morozov
f8248bbabf
Add syslog-tag option for syslog log-driver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: a81af2e26a19cca0ffb8cbfa619169d55d604789
Component: engine
2015-06-02 12:43:00 -07:00
Antonio Murdaca
8d306cf8a5
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e8c88d253337776a6075c9db69140ce2c5014622
Component: engine
2015-05-29 00:42:11 +02:00
John Howard
38fd09288b
Windows: Factor out syslog and journald
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 655a58e27bfcfd2494bb5d46f95cb49d655ad17a
Component: engine
2015-05-14 10:34:09 -07:00
Ahmet Alp Balkan
b1b57c9cd4
daemon: Logging drivers refactoring
...
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
(easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
existing behavior)
Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 3a8728b431df07249ad913ea9a12e27dc39b8956
Component: engine
2015-05-12 19:11:52 +00:00
Darren Shepherd
78dcc43512
Change syslog format and facility
...
This patch changes two things
1. Set facility to LOG_DAEMON
2. Remove ": " from tag so that the tag + pid become a single column in
the log
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: 05641ccffc5088a382fa3bfb21f1276ccb6c1fc0
Component: engine
2015-04-15 12:46:43 -07:00
Deng Guangxing
73f3660a47
move syslog-tag to syslog.New function
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4f91a333d5c9d66ce109c36e7261dbfd3382ebbf
Component: engine
2015-04-13 11:24:18 -07:00
Alena Prokharchyk
68100310d8
Removed unused "mutex" field
...
fixes #11659
Signed-off-by: Alena Prokharchyk <alena@rancher.com >
Upstream-commit: dabd8a02aeff8b2122efa0b55de4ba52c429f936
Component: engine
2015-03-23 19:05:21 -07:00
Anton Tiurin
59aa846db8
Syslog.Log - Remove redundant cast of msg.Line []byte to string as
...
it's a fmt.Sprintf responsibility.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
Upstream-commit: f2c7b4d7437443d469b2247362835af02ccef385
Component: engine
2015-03-24 01:35:54 +03:00
Alexander Morozov
974bfa30e6
Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check
...
syslog Close() - Remove redunant nil check, s.writer cannot be nil
Upstream-commit: 2717302cc69c865cfec02fb48b3cb173d6980364
Component: engine
2015-03-23 12:32:26 -07:00
Antonio Murdaca
84d2a9e3ec
Remove redunant nil check, s.writer cannot be nil
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e600df2d9732b8c40d056563e361ded6cd5ce773
Component: engine
2015-03-23 20:03:24 +01:00
Antonio Murdaca
1ef60888a8
Refactor syslog Log else clause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 8f025aae36fd040d8d2617890b258b5460ae44db
Component: engine
2015-03-23 20:01:01 +01:00
sidharthamani
a7d21898b0
add syslog driver
...
Signed-off-by: wlan0 <sid@rancher.com >
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
2015-03-21 18:01:18 -07:00