tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-21 12:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1878 from mnowster/change-default-log-driver-value

Browse Source 
Change default `log_driver` value
This commit is contained in:
Aanand Prasad 2015-09-15 17:23:00 +01:00
commit 1dabf1c366
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/service.py
View File

@ -657,7 +657,7 @@ class Service(object):
cap_add = options.get('cap_add', None) cap_add = options.get('cap_add', None)
cap_drop = options.get('cap_drop', None) cap_drop = options.get('cap_drop', None)
log_config = LogConfig( log_config = LogConfig(
type=options.get('log_driver', 'json-file'), type=options.get('log_driver', ""),
config=options.get('log_opt', None) config=options.get('log_opt', None)
) )
pid = options.get('pid', None) pid = options.get('pid', None)

5
tests/integration/service_test.py
View File

@ -864,7 +864,10 @@ class ServiceTest(DockerClientTestCase):
def test_log_drive_invalid(self): def test_log_drive_invalid(self):
service = self.create_service('web', log_driver='xxx') service = self.create_service('web', log_driver='xxx')
self.assertRaises(APIError, lambda: create_and_start_container(service)) expected_error_msg = "logger: no log driver named 'xxx' is registered"
with self.assertRaisesRegexp(APIError, expected_error_msg):
create_and_start_container(service)
def test_log_drive_empty_default_jsonfile(self): def test_log_drive_empty_default_jsonfile(self):
service = self.create_service('web') service = self.create_service('web')