From c7c3a5ddddac172ced3c947e8fe6c50bfdedc24a Mon Sep 17 00:00:00 2001 From: ronivay Date: Sat, 28 Jul 2018 19:54:23 +0300 Subject: [PATCH] Fix logging in container --- docker/Dockerfile | 4 ++++ docker/monit-services | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index be8334c..c43f9a1 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -36,6 +36,10 @@ RUN mv /etc/xen-orchestra/packages/xo-server/sample.config.yaml /etc/xen-orchest # Install forever for starting/stopping Xen-Orchestra RUN npm install forever -g +# Logging +RUN ln -sf /proc/1/fd/1 /var/log/redis/redis.log +RUN ln -sf /proc/1/fd/1 /var/log/xo-server.log + WORKDIR /etc/xen-orchestra/xo-server EXPOSE 80 diff --git a/docker/monit-services b/docker/monit-services index aa30a29..6fc3c7d 100644 --- a/docker/monit-services +++ b/docker/monit-services @@ -1,10 +1,10 @@ set init check process xo-server with pidfile /var/run/xo-server.pid - start program = "/usr/bin/forever start --pidFile /var/run/xo-server.pid --sourceDir /etc/xen-orchestra/packages/xo-server bin/xo-server" - stop program = "/usr/bin/forever stop /etc/xen-orchestra/packages/xo-server/bin/xo-server" - + depends on redis + start program = "/usr/bin/forever start --pidFile /var/run/xo-server.pid --sourceDir /etc/xen-orchestra/packages/xo-server -l /var/log/xo-server.log bin/xo-server" + stop program = "/usr/bin/forever stop /etc/xen-orchestra/packages/xo-server/bin/xo-server" check process redis with pidfile /var/run/redis_6379.pid - start program = "/usr/bin/redis-server /etc/redis.conf --daemonize yes" - stop program = "/usr/bin/redis-cli shutdown" + start program = "/usr/bin/redis-server /etc/redis.conf --daemonize yes" + stop program = "/usr/bin/redis-cli shutdown"