Changeset 312

Show
Ignore:
Timestamp:
01/22/08 01:45:16 (7 months ago)
Author:
gethema..@gmail.com
Message:

fixes for query all workers and starting workers which don't exist

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/framework/packet_master.rb

    r305 r312  
    111111      return if @live_workers[worker_name_key] 
    112112      worker_options.delete(:worker) 
    113       require worker_name 
    114       worker_klass = Object.const_get(packet_classify(worker_name)) 
    115       fork_and_load(worker_klass,worker_options) 
     113      begin 
     114        require worker_name 
     115        worker_klass = Object.const_get(packet_classify(worker_name)) 
     116        fork_and_load(worker_klass,worker_options) 
     117      rescue MissingSourceFile 
     118        puts "no such worker #{worker_name}" 
     119        return 
     120      end 
    116121    end 
    117122 
  • trunk/server/master_worker.rb

    r303 r312  
    4646      end 
    4747    end 
    48      
    49     #  
     48 
     49    # 
    5050    def pass_worker_info(t_data) 
    5151      worker_name_key = gen_worker_key(t_data[:worker],t_data[:job_key]) 
     
    5555      send_object(info_response) 
    5656    end 
    57      
     57 
    5858    def all_worker_info(t_data) 
    5959      info_response = [] 
     
    6767    def query_all_worker_status(p_data) 
    6868      dumpable_status = { } 
    69       reactor.live_workers.each { |key,value| dumpable_status[key] = value.worker_status
     69      reactor.live_workers.each { |key,value| dumpable_status[key] = reactor.result_hash[key]
    7070      send_object(dumpable_status) 
    7171    end