jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed process id

Browse Source
This commit is contained in:
albert
2011-08-30 14:51:19 -04:00
parent c0a352a499
commit 7caa905a15
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/upload.rb
View File

@@ -1,5 +1,6 @@
require "danbooru_image_resizer/danbooru_image_resizer"
require "tmpdir"
require "process"
class Upload < ActiveRecord::Base
class Error < Exception ; end
@@ -234,7 +235,7 @@ class Upload < ActiveRecord::Base
end
def temp_file_path
@temp_file_path ||= File.join(Rails.root, "tmp", "upload_#{Time.now.to_f}.#{$PROCESS_ID}")
@temp_file_path ||= File.join(Rails.root, "tmp", "upload_#{Time.now.to_f}.#{Process.pid}")
end
end

25
config/deploy.rb
View File

@@ -64,17 +64,22 @@ namespace :deploy do
namespace :web do
desc "Present a maintenance page to visitors."
task :disable do
maintenance_html_path = "#{release_path}/public/maintenance.html.bak"
run "if [ -e #{maintenance_html_path} ] ; then mv #{maintenance_html_path} #{release_path}/public/maintenance.html ; fi"
maintenance_html_path = "#{current_path}/public/maintenance.html.bak"
run "if [ -e #{maintenance_html_path} ] ; then mv #{maintenance_html_path} #{current_path}/public/maintenance.html ; fi"
end
desc "Makes the application web-accessible again."
task :enable do
maintenance_html_path = "#{release_path}/public/maintenance.html"
run "if [ -e #{maintenance_html_path} ] ; then mv #{maintenance_html_path} #{release_path}/public/maintenance.html.bak ; fi"
maintenance_html_path = "#{current_path}/public/maintenance.html"
run "if [ -e #{maintenance_html_path} ] ; then mv #{maintenance_html_path} #{current_path}/public/maintenance.html.bak ; fi"
end
end
desc "Restart the application"
task :restart do
run "touch #{current_path}/tmp/restart.txt"
end
desc "Compile the image resizer"
task :compile_image_resizer do
run "cd #{release_path}/lib/danbooru_image_resizer ; ruby extconf.rb ; make"
@@ -84,17 +89,17 @@ end
namespace :delayed_job do
desc "Start delayed_job process"
task :start, :roles => :app do
run "cd #{release_path}; script/delayed_job start #{rails_env}"
run "cd #{current_path}; script/delayed_job start #{rails_env}"
end
desc "Stop delayed_job process"
task :stop, :roles => :app do
run "cd #{release_path}; script/delayed_job stop #{rails_env}"
run "cd #{current_path}; script/delayed_job stop #{rails_env}"
end
desc "Restart delayed_job process"
task :restart, :roles => :app do
run "cd #{release_path}; script/delayed_job restart #{rails_env}"
run "cd #{current_path}; script/delayed_job restart #{rails_env}"
end
end
@@ -102,9 +107,9 @@ after "deploy:setup", "reset_ownership_of_common_directory"
after "deploy:setup", "local_config:setup_shared_directory"
after "deploy:setup", "local_config:setup_local_files"
after "deploy:setup", "data:setup_directories"
after "deploy:update_code", "local_config:link_local_files"
after "deploy:update_code", "data:link_directories"
after "deploy:update_code", "deploy:compile_image_resizer"
after "deploy:symlink", "local_config:link_local_files"
after "deploy:symlink", "data:link_directories"
after "deploy:symlink", "deploy:compile_image_resizer"
after "deploy:start", "delayed_job:start"
after "deploy:stop", "delayed_job:stop"
after "deploy:restart", "delayed_job:restart"