file-processing-job 0.1.2 → 1.2.5

data/lib/file-processing-job.rb

@@ -4,7 +4,6 @@ require 'eventmachine'
 require 'directory_watcher'
 
 module FileProcessingJob
-  
   def self.logger
     @@logger ||= begin
       if (const_defined?('Rails'))

data/lib/fpj/client.rb

@@ -26,10 +26,6 @@ module FileProcessingJob
         attr_accessor :callback
       end
 
-      def logger
-        FileProcessingJob.logger
-      end
-
       def request_task
         send_message('next')
       end

data/lib/fpj/connection.rb

@@ -8,6 +8,15 @@ module FileProcessingJob
       # set_comm_inactivity_timeout(120)
     end
 
+    def self.logger
+      FileProcessingJob.logger
+    end
+
+    def logger
+      FileProcessingJob.logger
+    end
+
+
     def receive_data(data)
       @recv_buffer.extract(data).each do |msg|
         receive_task(msg)
@@ -21,5 +30,6 @@ module FileProcessingJob
     def receive_request
       raise "receive_task not overridden by #{self.class.name}"
     end
+
   end
 end

data/lib/fpj/server.rb

@@ -138,28 +138,37 @@ module FileProcessingJob
     class Connection < FileProcessingJob::Connection
       @@q = EM::Queue.new()
 
-      def self.push(message)
-        FileProcessingJob.logger.debug "#{message} discovered in inbox"
-        @@q.push(message)
+      def self.push(filename)
+        if (filename.nil?)
+          #ignore
+        elsif (File.size(File.join(config.inbox_directory, filename)) == 0)
+          logger.error "Moving 0 byte file #{filename} to errors directory"
+          FileUtils.move(File.join(config.inbox_directory, filename), File.join(config.error_directory, filename))
+        else
+          FileProcessingJob.logger.debug "#{filename} discovered in inbox"
+          @@q.push(filename)
+        end
       end
 
+      def self.config
+        FileProcessingJob::Server.config
+      end
+      
       def config 
         @config ||= FileProcessingJob::Server.config
       end
       
-      def logger
-        FileProcessingJob.logger
-      end
-
       def send_file(filename)
         logger.debug "Sending #{filename} to client"
 
         send_message("filename: #{filename}")
 
         FileUtils.move(File.join(self.config.inbox_directory, filename), File.join(self.config.processing_directory, filename))
+        logger.debug "Sending file #{filename} to client"
         streamer = EventMachine::FileStreamer.new(self, File.join(self.config.processing_directory, filename))
         streamer.callback{
           send_data TOKEN
+          logger.debug "\tsuccessfully sent #{filename}"
         }
       end
       

metadata

@@ -3,10 +3,10 @@ name: file-processing-job
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 0
   - 1
   - 2
-  version: 0.1.2
+  - 5
+  version: 1.2.5
 platform: ruby
 authors: 
 - cj2
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -06:00
+date: 2010-12-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency