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

add server field to uploads

Browse Source
This commit is contained in:
albert
2013-01-06 16:07:55 -05:00
parent b6e9e5b41f
commit a7ac61e536
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/uploads_controller.rb
View File

@@ -23,7 +23,7 @@ class UploadsController < ApplicationController
end end
def create def create
@upload = Upload.create(params[:upload]) @upload = Upload.create(params[:upload].merge(:server => Socket.gethostname))
@upload.delay.process! @upload.delay.process!
respond_with(@upload) respond_with(@upload)
end end

1
app/models/upload.rb
View File

@@ -50,6 +50,7 @@ class Upload < ActiveRecord::Base
module ConversionMethods module ConversionMethods
def process! force=false def process! force=false
return if !force && status =~ /processing|completed|error/ return if !force && status =~ /processing|completed|error/
return if Socket.gethostname != server
CurrentUser.scoped(uploader, uploader_ip_addr) do CurrentUser.scoped(uploader, uploader_ip_addr) do
update_attribute(:status, "processing") update_attribute(:status, "processing")