Merge branch 'master' of github.com:rocker-org/shiny

rocker-org · May 2, 2019 · 4240fbe · 4240fbe
2 parents decfb85 + 6316c34
commit 4240fbe
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/shiny-server.sh b/shiny-server.sh
@@ -4,13 +4,11 @@
 mkdir -p /var/log/shiny-server
 chown shiny.shiny /var/log/shiny-server
 
-if [ "$APPLICATION_LOGS_TO_STDOUT" = "false" ];
+if [ "$APPLICATION_LOGS_TO_STDOUT" != "false" ];
 then
-    exec shiny-server 2>&1
-else
-    # start shiny server in detached mode
-    exec shiny-server 2>&1 &
+    # push the "real" application logs to stdout with xtail in detached mode
+    exec xtail /var/log/shiny-server/ &
+fi
 
-    # push the "real" application logs to stdout with xtail
-    exec xtail /var/log/shiny-server/
-fi
+# start shiny server
+exec shiny-server 2>&1