scales-server 0.0.1.beta.2 → 0.0.4

data/bin/scales-server-proxy

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require 'scales-server'
+
+Scales.pwd = Dir.pwd
+
+@port   = 3000
+@servers = []
+
+arguments = ARGV.dup
+while !arguments.empty? do
+  argument  = arguments.shift
+  if argument == "-p" or argument == "--port" then @port = arguments.shift else @servers << argument end
+end
+
+Scales::Server::Proxy::Backend.add(@servers)
+Scales::Server::Proxy.run!("0.0.0.0", @port)

data/lib/scales-server.rb

@@ -5,6 +5,7 @@ module Scales
     autoload :Status,       "scales-server/status"
     autoload :ContentType,  "scales-server/content_type"
     autoload :Server,       "scales-server/server"
+    autoload :Proxy,        "scales-server/proxy"
     autoload :Dispatch,     "scales-server/dispatch"
   end
 end

data/lib/scales-server/base.rb

@@ -6,16 +6,18 @@ module Scales
         ARGV << "--environment" << "#{Scales.env}"
         
         server      = Server.new
-        runner      = Goliath::Runner.new(ARGV, server)
-        runner.app  = Goliath::Rack::Builder.build(Server, server)
-        runner.load_plugins(Server.plugins)
+        @runner      = Goliath::Runner.new(ARGV, server)
+        @runner.app  = Goliath::Rack::Builder.build(Server, server)
+        @runner.load_plugins(Server.plugins)
         
-        status = Status.new(runner.address, runner.port)
+        status = Status.new(@runner.address, @runner.port)
         status.start!
-        at_exit{ status.stop! }
         Scales::Server.status = status
         
-        runner.run
+        @pid ||= Process.pid
+        at_exit{ status.stop! if !@runner.daemonize or Process.pid != @pid }
+        
+        @runner.run
       end
       
       @@status = nil

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

@@ -1,4 +1,5 @@
 require 'scales-core'
 require 'securerandom'
 
-autoload :Goliath, "scales-server/boot/initializers/goliath"
+autoload :Goliath,  "scales-server/boot/initializers/goliath"
+autoload :Proxy,    "scales-server/boot/initializers/proxy"

data/lib/scales-server/boot/initializers/proxy.rb

@@ -0,0 +1,2 @@
+require 'em-proxy'
+require 'uri'

data/lib/scales-server/dispatch.rb

@@ -4,12 +4,13 @@ module Scales
       autoload :Lookup,   "scales-server/dispatch/lookup"
       autoload :Enqueue,  "scales-server/dispatch/enqueue"
       autoload :Request,  "scales-server/dispatch/request"
+      autoload :Response, "scales-server/dispatch/response"
       autoload :Job,      "scales-server/dispatch/job"
      
       class << self
       
         def request(env)
-          if is_get_request?(env) then Lookup.ressource(env) else Enqueue.request(env) end
+          if is_get_request?(env) then Lookup.resource(env) else Enqueue.request(env) end
         end
       
         private

data/lib/scales-server/dispatch/enqueue.rb

@@ -9,10 +9,9 @@ module Scales
             job = Request.to_job(id, env)
             
             Scales::Server.status.put_request_in_queue!(job)
-            Queue::Async.add(JSON.generate(job))
+            Storage::Async.add(Storage::REQUEST_QUEUE, JSON.generate(job))
           
-            response = PubSub::Async.subscribe("scales_response_#{id}")
-            response = Job.to_response(response)
+            response = Response.subscribe(id)
             Scales::Server.status.took_response_from_queue!(response)
             response
           end
@@ -21,7 +20,7 @@ module Scales
         
           def create_random_id
             id = SecureRandom.hex(16)
-            Storage::Async.connection.set("test_last_request_id", "scales_response_#{id}") if Goliath.env == :test
+            Storage::Async.connection.set("test_last_request_id", id) if Goliath.env == :test
             id
           end
       

data/lib/scales-server/dispatch/lookup.rb

@@ -4,7 +4,7 @@ module Scales
       module Lookup
         class << self
       
-          def ressource(env)
+          def resource(env)
             response = Storage::Async.get_content(path(env), Scales.config.partials)
             response.nil? ? render_not_found : render(response)
           end

data/lib/scales-server/dispatch/response.rb

@@ -0,0 +1,49 @@
+module Scales
+  module Server
+    module Dispatch
+      module Response
+        class << self
+          
+          @@redis       = nil
+          @@subscribers = {}
+          @@subscribed  = false
+          
+          def subscribe(id)
+            setup_subscription!
+            @@subscribers[id] = Fiber.current
+            Fiber.yield
+          end
+          
+          def reset!
+            @@redis       = nil
+            @@subscribers = {}
+            @@subscribed  = false
+          end
+          
+          private
+          
+          def connect!
+            return if @@redis and @@redis.connected?
+            @@redis = Storage::Async.new_connection!
+          end
+          
+          def setup_subscription!
+            connect!
+            return if @@subscribed
+
+            @@redis.subscribe(Storage::RESPONSE_CHANNEL)
+            @@redis.on(:message) do |channel, message|
+              response  = Job.to_response(message)
+              id        = response[1]['scales.id']
+              
+              fiber = @@subscribers.delete(id)
+              fiber.resume(response) if fiber
+            end
+            @@subscribed = true
+          end
+          
+        end
+      end
+    end
+  end
+end

data/lib/scales-server/proxy.rb

@@ -0,0 +1,31 @@
+module Scales
+  module Server
+    module Proxy      
+      autoload :Backend,    "scales-server/proxy/backend"
+      autoload :Callbacks,  "scales-server/proxy/callbacks"
+      
+      class << self
+        
+        def run!(host = '0.0.0.0', port = 9999)
+          
+          puts "Proxy Port:     #{port}".green
+          puts "Server Ports:   #{Backend.ports.join(', ')}".green
+          
+          ::Proxy.start(:host => host, :port => port, :debug => false) do |connection|
+
+            Backend.select do |backend|
+              connection.server backend, :host => backend.host, :port => backend.port
+
+              connection.on_connect  &Callbacks.on_connect
+              connection.on_data     &Callbacks.on_data
+              connection.on_response &Callbacks.on_response
+              connection.on_finish   &Callbacks.on_finish
+            end
+
+          end
+        end
+        
+      end
+    end
+  end
+end

data/lib/scales-server/proxy/backend.rb

@@ -0,0 +1,66 @@
+module Scales
+  module Server
+    module Proxy
+      
+      class Backend
+        @ports = []
+        attr_reader   :url, :host, :port
+        attr_accessor :load
+        alias         :to_s :url
+
+        def initialize(options={})
+          raise ArgumentError, "Please provide a :url and :load" unless options[:url]
+          @url   = options[:url]
+          @load  = options[:load] || 0
+          parsed = URI.parse(@url)
+          @host, @port = parsed.host, parsed.port
+        end
+        
+        def self.add(ports)
+          ports.each{ |port| @ports << { :url => "http://0.0.0.0:#{port}" } }
+        end
+        
+        def self.ports
+          @ports.map{ |port| port[:url].split(":").last }
+        end
+
+        def self.select(strategy = :balanced)
+          @strategy = strategy.to_sym
+          case @strategy
+            when :balanced
+              backend = list.sort_by { |b| b.load }.first
+            when :roundrobin
+              @pool   = list.clone if @pool.nil? || @pool.empty?
+              backend = @pool.shift
+            when :random
+              backend = list[ rand(list.size-1) ]
+            else
+              raise ArgumentError, "Unknown strategy: #{@strategy}"
+          end
+
+          Callbacks.on_select.call(backend)
+          yield backend if block_given?
+          backend
+        end
+
+        def self.list
+          @list ||= @ports.map { |backend| new backend }
+        end
+
+        def self.strategy
+          @strategy
+        end
+
+        def increment_counter
+          self.load += 1
+        end
+
+        def decrement_counter
+          self.load -= 1
+        end
+
+      end
+      
+    end
+  end
+end

data/lib/scales-server/proxy/callbacks.rb

@@ -0,0 +1,31 @@
+module Scales
+  module Server
+    module Proxy
+      
+      module Callbacks
+        extend  self
+
+        def on_connect
+        end
+
+        def on_data
+          lambda { |data| data }
+        end
+
+        def on_response
+          lambda { |backend, response|  response }
+        end
+
+        def on_select
+          lambda { |backend| backend.increment_counter if Backend.strategy == :balanced }
+        end
+
+        def on_finish
+          lambda { |backend| backend.decrement_counter if Backend.strategy == :balanced }
+        end
+
+      end
+      
+    end
+  end
+end

data/lib/scales-server/version.rb

@@ -1,5 +1,5 @@
 module Scales
   module Server
-    VERSION = "0.0.1.beta.2"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: scales-server
 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: rake
-  requirement: &70117378273540 !ruby/object:Gem::Requirement
+  requirement: &70195223931780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70117378273540
+  version_requirements: *70195223931780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70117378271400 !ruby/object:Gem::Requirement
+  requirement: &70195223931280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,21 +32,21 @@ dependencies:
         version: '2.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70117378271400
+  version_requirements: *70195223931280
 - !ruby/object:Gem::Dependency
   name: scales-core
-  requirement: &70117378269120 !ruby/object:Gem::Requirement
+  requirement: &70195223930840 !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: *70117378269120
+  version_requirements: *70195223930840
 - !ruby/object:Gem::Dependency
   name: goliath
-  requirement: &70117378283580 !ruby/object:Gem::Requirement
+  requirement: &70195223930340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,12 +54,24 @@ dependencies:
         version: 1.0.0.beta.1
   type: :runtime
   prerelease: false
-  version_requirements: *70117378283580
+  version_requirements: *70195223930340
+- !ruby/object:Gem::Dependency
+  name: em-proxy
+  requirement: &70195223929840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *70195223929840
 description: Super Scale Caching Framework - Server
 email:
 - tommylefunk@googlemail.com
 executables:
 - scales-server
+- scales-server-proxy
 extensions: []
 extra_rdoc_files: []
 files:
@@ -67,18 +79,25 @@ files:
 - lib/scales-server/base.rb
 - lib/scales-server/boot/autoload.rb
 - lib/scales-server/boot/initializers/goliath.rb
+- lib/scales-server/boot/initializers/proxy.rb
 - lib/scales-server/content_type.rb
 - lib/scales-server/dispatch/enqueue.rb
 - lib/scales-server/dispatch/job.rb
 - lib/scales-server/dispatch/lookup.rb
 - lib/scales-server/dispatch/request.rb
+- lib/scales-server/dispatch/response.rb
 - lib/scales-server/dispatch.rb
+- lib/scales-server/proxy/backend.rb
+- lib/scales-server/proxy/callbacks.rb
+- lib/scales-server/proxy.rb
 - lib/scales-server/server.rb
 - lib/scales-server/status.rb
 - lib/scales-server/version.rb
 - lib/scales-server.rb
 - !binary |-
   YmluL3NjYWxlcy1zZXJ2ZXI=
+- !binary |-
+  YmluL3NjYWxlcy1zZXJ2ZXItcHJveHk=
 homepage: http://itscales.org
 licenses: []
 post_install_message: 
@@ -94,9 +113,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