scales-worker 0.0.1.beta.2 → 0.0.4

data/lib/scales-worker/boot/autoload.rb

@@ -1,4 +1,5 @@
 require 'scales-core'
+require 'logger'
 
 autoload :Rake,     "scales-worker/boot/initializers/rake"
 autoload :Nokogiri, "scales-worker/boot/initializers/nokogiri"

data/lib/scales-worker/pusher.rb

@@ -24,9 +24,9 @@ module Scales
         env = Path.with_options_to_env(path)
         
         response  = @app.call(env)
-        response.last.close
+        response.last.close if response.last.respond_to?(:close)
         
-        Storage::Sync.set_content(path[:to], Response.to_string(response)) if path[:push]
+        push_response(path, Response.to_string(response)) if path[:push]
         
         env
       end
@@ -37,7 +37,7 @@ module Scales
           
           begin
             response  = @app.call(request)
-            response.last.close
+            response.last.close if response.last.respond_to?(:close)
           rescue Exception => e
             puts e
           end
@@ -70,6 +70,18 @@ module Scales
         puts "Pushing paths:  #{progress}% (#{@done}/#{@total})".green
         puts "Done.".green
       end
+      
+      private
+      
+      def push_response(path, response)
+        Storage::Sync.set_content(path[:to], response) 
+        data = {
+          :path   => path[:to],
+          :format => path[:format].to_s.upcase,
+          :type   => "push_#{Cache.resource_or_partial?(path[:to])}"
+        }
+        Storage::Sync.connection.publish "scales_monitor_events", data.to_json
+      end
     end
   end
 end

data/lib/scales-worker/status.rb

@@ -2,12 +2,15 @@ module Scales
   module Worker
     
     class Status
-      attr_reader :key, :id, :address, :port
+      attr_reader :key, :id, :address, :port, :logger, :log_path
       
       def initialize address, port = nil
-        @id   = SecureRandom.hex(8)
-        @key  = "scales_worker_#{@id}"
+        @id             = SecureRandom.hex(8)
+        @key            = "scales_worker_#{@id}"
         @address, @port = address.to_s, port.to_s
+        @log_path       = "log/scales_worker.#{@id}.log"
+        @logger         = Logger.new(Scales.env == "test" ? STDOUT : @log_path)
+        @redis          = Scales::Storage::Sync.new_connection!
       end
       
       def start!
@@ -22,8 +25,8 @@ module Scales
         }
         json = JSON.generate(data)
         
-        Storage::Sync.connection.set(@key, json)
-        Storage::Sync.connection.publish("scales_monitor_events", json)
+        @redis.set(@key, json)
+        @redis.publish("scales_monitor_events", json)
         @already_stopped = false
       end
       
@@ -36,8 +39,8 @@ module Scales
           :type       => "worker_stopped"
         }
         json = JSON.generate(data)
-        Storage::Sync.connection.del(@key)
-        Storage::Sync.connection.publish("scales_monitor_events", json)
+        @redis.del(@key)
+        @redis.publish("scales_monitor_events", json)
         @already_stopped = true
       end
       
@@ -50,7 +53,7 @@ module Scales
           :method     => job['REQUEST_METHOD']
         }
         json = JSON.generate(data)
-        Storage::Sync.connection.publish("scales_monitor_events", json)
+        @redis.publish("scales_monitor_events", json)
       end
       
       def put_response_in_queue!(response)
@@ -63,7 +66,7 @@ module Scales
           :status     => response[0]
         }
         json = JSON.generate(data)
-        Storage::Sync.connection.publish("scales_monitor_events", json)
+        @redis.publish("scales_monitor_events", json)
       end
       
     end  

data/lib/scales-worker/version.rb

@@ -1,5 +1,5 @@
 module Scales
   module Worker
-    VERSION = "0.0.1.beta.2" unless defined?(Scales::Worker::VERSION)
+    VERSION = "0.0.4" unless defined?(Scales::Worker::VERSION)
   end
 end

data/lib/scales-worker/worker.rb

@@ -3,9 +3,11 @@ module Scales
     class Worker
       attr_reader :app
       attr_reader :type
+      attr_reader :pool
+      attr_reader :status
     
       def initialize(type = Application::Rails)
-        @type, @app, @status = type, type.app, Status.new("localhost")
+        @type, @app, @status, @pool = type, type.app, Status.new("localhost"), []
         at_exit{ @status.stop! }
       end
       
@@ -21,10 +23,10 @@ module Scales
         
         begin
           response  = @app.call(env)
-          response.last.close
+          response.last.close if response.last.respond_to?(:close)
           [id, Response.to_job(id, response)]
-        rescue
-          [id, [500, {}, ""]]
+        rescue Exception => e
+          [id, [500, {}, e.to_s]]
         end
       end
       
@@ -35,7 +37,7 @@ module Scales
           
           begin
             response  = @app.call(request)
-            response.last.close
+            response.last.close if response.last.respond_to?(:close)
           rescue Exception => e
             puts e
           end
@@ -43,24 +45,38 @@ module Scales
       end
       
       # Wait for a request, process it, publish the response and exit
-      def process_request!(should_wait_for_request_to_finish = false)
-        job = Scales::Queue::Sync.pop
+      def process_request!
+        job = Thread.current[:redis_blocking].brpop(Scales::Storage::REQUEST_QUEUE, 0).last
         id, response = nil, nil
         
-        Thread.abort_on_exception = true
-        thread = Thread.new do
-          Thread.current[:post_process_queue] = []
-          id, response = process!(job)
-          post_process!(job)
-          @status.put_response_in_queue!(response)
-          Scales::PubSub::Sync.publish("scales_response_#{id}", JSON.generate(response))
-        end
-        
-        thread.join if should_wait_for_request_to_finish
+        Thread.current[:post_process_queue] = []
+        id, response = process!(job)
+        post_process!(job)
+        @status.put_response_in_queue!(response)
+        Thread.current[:redis_nonblocking].publish(Scales::Storage::RESPONSE_CHANNEL, JSON.generate(response))
         
         [id, response]
       end
       
+      def start_pool!(size = Scales.config.worker_threads)
+        Thread.abort_on_exception = true
+        size.times do
+          @pool << Thread.new do
+            Thread.current[:redis_blocking]     = Scales::Storage::Sync.new_connection!
+            Thread.current[:redis_nonblocking]  = Scales::Storage::Sync.new_connection!
+            loop do
+              begin
+                process_request!
+              rescue Exception => e
+                @status.logger.error(e.to_s)
+                raise e if Scales.env == "test"
+              end
+            end
+          end
+        end
+        sleep
+      end
+      
       # Loop the processing of requests
       def work!
         @status.start!
@@ -68,11 +84,14 @@ module Scales
         puts "Environment:    #{Scales.env}".green
         puts "Application:    #{@type.name}".green
         puts "Path:           #{Dir.pwd}".green
+        puts "Log Path:       #{@status.log_path}".green
+        puts "Threads:        #{Scales.config.worker_threads}".green
         puts "Redis:          #{Scales.config.host}:#{Scales.config.port}/#{Scales.config.database}".green
         
         begin
-          loop{ process_request! }
+          start_pool!
         rescue Interrupt => e
+          @pool.map(&:exit)
           puts "Goodbye".green
         end
       end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: scales-worker
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.2
-  prerelease: 6
+  version: 0.0.4
+  prerelease: 
 platform: ruby
 authors:
 - Thomas Fankhauser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: scales-core
-  requirement: &70334695096040 !ruby/object:Gem::Requirement
+  requirement: &70342046065420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.1.beta.2
+        version: 0.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70334695096040
+  version_requirements: *70342046065420
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70334695094700 !ruby/object:Gem::Requirement
+  requirement: &70342046064960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *70334695094700
+  version_requirements: *70342046064960
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70334695092920 !ruby/object:Gem::Requirement
+  requirement: &70342046064460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: *70334695092920
+  version_requirements: *70342046064460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334695092120 !ruby/object:Gem::Requirement
+  requirement: &70342046064000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70334695092120
+  version_requirements: *70342046064000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70334695090700 !ruby/object:Gem::Requirement
+  requirement: &70342046063540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70334695090700
+  version_requirements: *70342046063540
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70334695111200 !ruby/object:Gem::Requirement
+  requirement: &70342046063080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *70334695111200
+  version_requirements: *70342046063080
 - !ruby/object:Gem::Dependency
   name: jsonpath
-  requirement: &70334695110220 !ruby/object:Gem::Requirement
+  requirement: &70342046062620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70334695110220
+  version_requirements: *70342046062620
 description: Super Scale Caching Framework - Worker
 email:
 - tommylefunk@googlemail.com
@@ -138,9 +138,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11