From 3640b0bd0e7460432623d73ea1291f728294dcdb Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Fri, 17 Aug 2018 15:30:37 +0200 Subject: [PATCH] Allow to override the logging backend for app like che --- src/dockerproxy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dockerproxy.js b/src/dockerproxy.js index a183656a0..7105ec9e4 100644 --- a/src/dockerproxy.js +++ b/src/dockerproxy.js @@ -71,7 +71,8 @@ function attachDockerRequest(req, res, next) { function containersCreate(req, res, next) { safe.set(req.body, 'HostConfig.NetworkMode', 'cloudron'); // overwrite the network the container lives in safe.set(req.body, 'Labels', _.extend({ }, safe.query(req.body, 'Labels'), { appId: req.app.id })); // overwrite the app id to track containers of an app - safe.set(req.body, 'HostConfig.LogConfig', { Type: 'syslog', Config: { 'tag': req.app.id, 'syslog-address': 'udp://127.0.0.1:2514', 'syslog-format': 'rfc5424' }}); + + if (!req.app.manifest.addons.docker.nativeLogging) safe.set(req.body, 'HostConfig.LogConfig', { Type: 'syslog', Config: { 'tag': req.app.id, 'syslog-address': 'udp://127.0.0.1:2514', 'syslog-format': 'rfc5424' }}); const appDataDir = path.join(paths.APPS_DATA_DIR, req.app.id, 'data'), dockerDataDir = path.join(paths.APPS_DATA_DIR, req.app.id, 'docker');