Browse code

Merge pull request #12387 from x1022as/inspect-logpath

Inspect show right LogPath in json-file driver

Brian Goff authored on 2015/04/16 03:28:39
Showing 3 changed files
... ...
@@ -1406,6 +1406,7 @@ func (container *Container) startLogging() error {
1406 1406
 		if err != nil {
1407 1407
 			return err
1408 1408
 		}
1409
+		container.LogPath = pth
1409 1410
 
1410 1411
 		dl, err := jsonfilelog.New(pth)
1411 1412
 		if err != nil {
... ...
@@ -359,7 +359,10 @@ Return low-level information on the container `id`
359 359
 				"MaximumRetryCount": 2,
360 360
 				"Name": "on-failure"
361 361
 			},
362
-           "LogConfig": { "Type": "json-file", Config: {} },
362
+			"LogConfig": {
363
+				"Config": null,
364
+				"Type": "json-file"
365
+			},
363 366
 			"SecurityOpt": null,
364 367
 			"VolumesFrom": null,
365 368
 			"Ulimits": [{}]
... ...
@@ -362,7 +362,10 @@ Return low-level information on the container `id`
362 362
 				"MaximumRetryCount": 2,
363 363
 				"Name": "on-failure"
364 364
 			},
365
-           "LogConfig": { "Type": "json-file", "Config": {} },
365
+			"LogConfig": {
366
+				"Config": null,
367
+				"Type": "json-file"
368
+			},
366 369
 			"SecurityOpt": null,
367 370
 			"VolumesFrom": null,
368 371
 			"Ulimits": [{}]