initial work on mapper daemon

Author: fredemmott

classes/jp_config_loader.rb

@@ -1,29 +1,41 @@
 #!/usr/bin/env ruby
 # Find a config file and load it
 module Jp
-	def self.load_config
-		# Where we look for config files
+	def self.load_server_config
+		load config_file 'jp-config'
+		c = JpConfig.new
+		def c.options
+			m = self.public_methods - Object.public_methods - [:options]
+			h = Hash.new
+			m.each do |method|
+				h[method] = self.send method
+			end
+			h
+		end
+		c.options
+	end
+
+	def self.load_mapper_config
+		load config_file 'jp-mapper-config'
+		JpMapperConfig.new
+	end
+
+	private
+	def self.config_file name
+		if ARGV[0] && File.exists?(ARGV[0])
+			return File.expand_path ARGV[0]
+		end
+
+		# Prefixes
 		[
-			ARGV[0],
-			'./jp-config.rb',
-			'~/jp-config.rb',
-			'~/.jp-config.rb',
-			'/etc/jp-config.rb',
-		].each do |path|
-			next unless path
-			full = File.expand_path path
+			'./',
+			'~/',
+			'~/.',
+			'/etc/',
+		].each do |prefix|
+			full = File.expand_path "%s%s.rb" % [prefix, name]
 			if File.exists? full
-				load full
-				c = JpConfig.new
-				def c.options
-					m = self.public_methods - Object.public_methods - [:options]
-					h = Hash.new
-					m.each do |method|
-						h[method] = self.send method
-					end
-					h
-				end
-				return c.options
+				return full
 			end
 		end
 		raise 'No config file found.'

classes/jp_mapper.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.push File.dirname(__FILE__) + '/../gen-rb/'
+
+require 'job_pool_instrumented'
+require 'ruby-1.9.0-compat'
+
+include Jp
+
+class JpMapper
+	def initialize config, options = {}
+		if config.respond_to? :port_number
+			port_number = config.port_number
+		end
+		port_number ||= 9090
+		raise ArgumentError.new "config object doesn't provide mapping" unless config.respond_to? :host_for_pool
+		@config = config
+
+		# Setup Thrift server (allowing dependency injection)
+		if options.member? :injected_thrift_server then
+			@server = options[:injected_thrift_server]
+		else
+			processor = options[:thrift_processor] # For testing, and allow instrumented server to override
+			processor ||= JobPool::Processor.new self
+			socket = Thrift::ServerSocket.new port_number
+			transportFactory = Thrift::BufferedTransportFactory.new
+
+			@server = Thrift::ThreadedServer.new processor, socket, transportFactory
+		end
+	end
+
+	def serve
+		@server.serve
+	end
+	
+	def add pool, message
+		upstream_for_pool(pool).add(pool, message)
+	end
+
+	def acquire pool
+		upstream_for_pool(pool).acquire(pool)
+	end
+
+	def purge pool, id
+		upstream_for_pool(pool).purge(pool, id)
+	end
+
+	private
+	def upstream_for_pool pool
+		@clients ||= Hash.new
+		upstream = @config.host_for_pool pool
+
+		# Well... in practise, you'll want to specify one or the other ;)
+		upstream[:host] ||= 'localhost'
+		upstream[:port] ||= 9090
+
+		unless @clients.member? upstream
+			socket = Thrift::Socket.new upstream[:host], upstream[:port]
+			transport = Thrift::BufferedTransport.new socket
+			protocol = Thrift::BinaryProtocol.new transport
+			client = JobPool::Client.new protocol
+			@clients[upstream] = client
+		end
+		@clients[upstream]
+	end
+end

examples/jp-mapper-config.rb

@@ -0,0 +1,16 @@
+class JpMapperConfig
+	def host_for_pool pool
+		case pool
+			when 'foo'
+				{host: 'localhost', port: 9090}
+			when /^foo/
+				{host: 'localhost', port: 9091}
+			when 'bar'
+				{host: 'localhost', port: 9092}
+			else
+				{host: 'localhost', port: 9093}
+				# Alternatively:
+				# raise Jp::NoSuchPool.new
+		end
+	end
+end

jp

@@ -5,5 +5,5 @@ $LOAD_PATH.push File.dirname(__FILE__) + '/classes/'
 require 'jp_config_loader'
 require 'jp_instrumented_server'
 
-s = JpInstrumentedServer.new Jp::load_config
+s = JpInstrumentedServer.new Jp::load_server_config
 s.serve

jp-mapper

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+$LOAD_PATH.push File.dirname(__FILE__)
+$LOAD_PATH.push File.dirname(__FILE__) + '/classes/'
+
+require 'jp_config_loader'
+require 'jp_mapper'
+
+s = JpMapper.new Jp::load_mapper_config
+s.serve

jp-unlocker

@@ -5,5 +5,5 @@ $LOAD_PATH.push File.dirname(__FILE__) + '/classes/'
 require 'jp_config_loader'
 require 'jp_unlocker'
 
-s = JpUnlocker.new Jp::load_config
+s = JpUnlocker.new Jp::load_server_config
 s.run