From a7ac61e536668fa18fe077ae1a244536789eadc9 Mon Sep 17 00:00:00 2001 From: albert Date: Sun, 6 Jan 2013 16:07:55 -0500 Subject: [PATCH] add server field to uploads --- app/controllers/uploads_controller.rb | 2 +- app/models/upload.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index a1c86a63e..d10d42f60 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -23,7 +23,7 @@ class UploadsController < ApplicationController end def create - @upload = Upload.create(params[:upload]) + @upload = Upload.create(params[:upload].merge(:server => Socket.gethostname)) @upload.delay.process! respond_with(@upload) end diff --git a/app/models/upload.rb b/app/models/upload.rb index a0aba0c9c..ed468f380 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -50,6 +50,7 @@ class Upload < ActiveRecord::Base module ConversionMethods def process! force=false return if !force && status =~ /processing|completed|error/ + return if Socket.gethostname != server CurrentUser.scoped(uploader, uploader_ip_addr) do update_attribute(:status, "processing")