Changeset 283
- Timestamp:
- 12/17/07 01:12:12 (8 months ago)
- Files:
-
- trunk/framework/core.rb (modified) (1 diff)
- trunk/framework/double_keyed_hash.rb (modified) (1 diff)
- trunk/framework/packet_master.rb (modified) (1 diff)
- trunk/server/master_worker.rb (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/framework/core.rb
r279 r283 65 65 def accept_connection(sock_opts) 66 66 sock_io = sock_opts[:socket] 67 puts "Someone is attempting a connection"68 67 begin 69 68 client_socket,client_sockaddr = sock_io.accept_nonblock trunk/framework/double_keyed_hash.rb
r217 r283 1 1 class DoubleKeyedHash 2 attr_accessor :internal_hash 2 3 def initialize 3 4 @keys1 = {} trunk/framework/packet_master.rb
r279 r283 41 41 worker_name_key = gen_worker_key(worker_name,data_options[:job_key]) 42 42 data_options[:client_signature] = connection.fileno 43 workers[worker_name_key].send_request(data_options)43 reactor.live_workers[worker_name_key].send_request(data_options) 44 44 end 45 45 trunk/server/master_worker.rb
r279 r283 44 44 def query_all_worker_status(p_data) 45 45 dumpable_status = { } 46 workers.each { |key,value| dumpable_status[key] = value.worker_status }46 reactor.live_workers.each { |key,value| dumpable_status[key] = value.worker_status } 47 47 send_object(dumpable_status) 48 48 end … … 55 55 ask_worker(worker_name,:job_key => t_data[:job_key],:type => :request, :data => { :worker_method => :exit}) 56 56 rescue Packet::DisconnectError => sock_error 57 workers.delete(worker_name_key)57 reactor.live_workers.delete(worker_name_key) 58 58 rescue 59 59 debug_logger.info($!.to_s) … … 73 73 t_data.delete(:type) 74 74 begin 75 ask_worker(worker_name ,:data => t_data, :type => :request)75 ask_worker(worker_name_key,:data => t_data, :type => :request) 76 76 rescue Packet::DisconnectError => sock_error 77 workers.delete(worker_name_key)77 reactor.live_workers.delete(worker_name_key) 78 78 rescue 79 79 debug_logger.info($!.to_s) … … 98 98 t_data.delete(:type) 99 99 begin 100 ask_worker(worker_name ,:data => t_data, :type => :request)100 ask_worker(worker_name_key,:data => t_data, :type => :request) 101 101 rescue Packet::DisconnectError => sock_error 102 workers.delete(worker_name_key)102 reactor.live_workers.delete(worker_name_key) 103 103 rescue 104 104 debug_logger.info($!.to_s)
