@@ -1,2 +1,4 @@ *.log -blog.db +tmp/* +config/app_config.rb +config/config.yml .gitignore @@ -1,9 +1,8 @@ -port = 3030 - +ports = [4567,4568] desc "Start the app server" task :start => :stop do puts "Starting the blog" - system "ruby main.rb -p #{port} > access.log 2>&1 &" + system "thin -s 2 -C config/config.yml -R config/rackup.ru start" end # code lifted from rush @@ -28,11 +27,13 @@ rescue Errno::ESRCH end desc "Stop the app server" -task :stop do - m = `netstat -lptn | grep 0.0.0.0:#{port}`.match(/LISTEN\s*(\d+)/) - if m - pid = m[1].to_i - puts "Killing old server #{pid}" - kill_process(pid) - end +task :stop do + ports.each do |port| + m = `netstat -lptn | grep 127.0.0.1:#{port}`.match(/LISTEN\s*(\d+)/) + if m + pid = m[1].to_i + puts "Killing old server #{pid}" + kill_process(pid) + end + end end \ No newline at end of file Rakefile @@ -7,4 +7,4 @@ set :env, :production disable :run, :reload -run Sinatra.application +run Sinatra.application \ No newline at end of file config/rackup.ru @@ -1,20 +1,6 @@ require 'rubygems' require 'sinatra' - -configure do - require 'ostruct' - Blog = OpenStruct.new( - :title => 'scanty on the couch', - :author => 'Joel Tulloch', - :url_base => 'http://localhost:4567/', - :database_name => 'change_this', - :url_base_database => nil, - :admin_password => 'changethis', - :admin_cookie_key => 'admin_cookie_key', - :admin_cookie_value => '54l976913ace58', - :disqus_shortname => nil - ) -end +require 'config/app_config.rb' error do e = request.env['sinatra.error'] @@ -122,7 +108,6 @@ post '/past/:year/:month/:day/:slug/' do post.title = params[:title] post.tags = parse_tags(params[:tags]) post.body = params[:body] - post.save - redirect post.url + redirect post.url if post.save end main.rb ecca5b9aef5d6fb4c65385aabee9d6ed6adcdd45 joel joel@jtulloch.com http://github.com/jtulloch/scanty/commit/2f529db3ff3836d79292b9c6880b9bddc4562ffd 2f529db3ff3836d79292b9c6880b9bddc4562ffd 2008-12-09T17:53:13-08:00 2008-12-09T17:53:13-08:00 updated rake for Thin and pulled config struct to seperate file 6590b74d38b548d688fe28e097d2939080dd57ec joel joel@jtulloch.com