add server field to uploads

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

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")