lib/nginxtra/actions/start.rb in nginxtra-1.10.1.12 vs lib/nginxtra/actions/start.rb in nginxtra-1.10.1.13

@@ -47,12 +47,16 @@
       def should_start?
         return true if force?
         !Nginxtra::Config.nginx_running?
       end
 
-      # Start nginx as a daemon.
+      # Start nginx as a daemon, unless --no-daemon is provided.
       def start_nginx
-        daemon :start
+        if @thor.options["daemon"]
+          daemon :start
+        else
+          exec [Nginxtra::Config.nginx_executable, "nginx"]
+        end
       end
 
       # Update the last nginx start time.
       def update_last_start
         Nginxtra::Status[:last_start_time] = Time.now