Merge pull request #1232 from sshaw/server_pid_path

Padrino::Server - call expand_path on PID file option
padrino · Apr 8, 2013 · ef453cc · ef453cc
2 parents 268da6a + cb862c0
commit ef453cc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/padrino-core/lib/padrino-core/server.rb b/padrino-core/lib/padrino-core/server.rb
@@ -27,7 +27,7 @@ def self.start(app, opts={})
       options[:Port] = options.delete(:port) || 3000
       options[:AccessLog] = []
       if options[:daemonize]
-        options[:pid] = options[:pid].blank? ? File.expand_path('tmp/pids/server.pid') : opts[:pid]
+        options[:pid] = File.expand_path(options[:pid].blank? ? 'tmp/pids/server.pid' : opts[:pid])
         FileUtils.mkdir_p(File.dirname(options[:pid]))
       end
       options[:server] = detect_rack_handler if options[:server].blank?