acpc_table_manager 1.0.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c92fc6d2b98a660e84a1c35388a611ea823e1aff
-  data.tar.gz: ca8cf252e3be0b58f38eae14b5473e7fc03eb717
+  metadata.gz: e5d135a405ab862b042bc72b5bc5f9171e3bd0ed
+  data.tar.gz: 0ee34a84a44f500946fdab2e8b08945b0ce09366
 SHA512:
-  metadata.gz: 19bb3dcdffa38b0569a6f3634a3e7010783f9022867bbf589c778ea89d17f427b0b3a3f877295bd914437b884af637791dc741da51832ed6e6106589f10f6c5c
-  data.tar.gz: 39be21a03b63c06f4124df18bb2e009557d7208e3fb53d234fae85800ca0fba148c357f2b17c897306e3a63f86daf9587cbcb42a7fdcb40733e322ff0ede65e7
+  metadata.gz: 8c0d1bee251f1d5bc040c6feb568cc278ef5fcbef42f020199ab5dea64ebb89c0a92ed7e440ffa6a67a210da187d1e4810ac7fb849e063803b5bc1bd40877d8d
+  data.tar.gz: a13cab8ef8c26b889577d05094bed698b00ceca9f02bba5b34c137f8fe73dd2534ffdefd2dd0d8e4e4c835905753a975d00862c9d3db36733aff9bf1b1fb2812

data/exe/acpc_proxy

@@ -44,8 +44,12 @@ unless match.running? && !match.finished?
   raise OptionParser::ArgumentError.new("Match \"#{options[:match_id]}\" is not running or has already finished.")
 end
 
+Signal.trap("INT") { exit }
+Signal.trap("TERM") { exit }
+
 begin
   proxy = AcpcTableManager::Proxy.start match
+  proxy.log __method__, options
   loop do
     message = AcpcTableManager.redis.blpop(
       "#{AcpcTableManager.config.player_action_channel_prefix}#{options[:match_id]}",
@@ -78,5 +82,5 @@ rescue => e
     },
     Logger::Severity::ERROR
   )
-  Rusen.notify e # Send an email notification
+  AcpcTableManager.notify e # Send an email notification
 end

data/exe/acpc_table_manager

@@ -30,6 +30,10 @@ CONFIG_FILE = options[:table_manager_config]
 
 AcpcTableManager.load! CONFIG_FILE
 table_manager = AcpcTableManager::Maintainer.new
+
+Signal.trap("INT") { exit }
+Signal.trap("TERM") { exit }
+
 loop do
   begin
     message = AcpcTableManager.redis.blpop("table-manager", :timeout => AcpcTableManager.config.maintenance_interval_s)
@@ -64,6 +68,6 @@ loop do
       },
       Logger::Severity::ERROR
     )
-    Rusen.notify e # Send an email notification
+    AcpcTableManager.notify e
   end
 end

data/lib/acpc_table_manager/config.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'json'
 require 'mongoid'
+require 'moped'
 require 'rusen'
 require 'contextual_exceptions'
 require 'acpc_dealer'
@@ -18,9 +19,9 @@ module AcpcTableManager
     THIS_MACHINE = Socket.gethostname
     DEALER_HOST = THIS_MACHINE
 
-    attr_reader :file, :log_directory, :my_log_directory, :match_log_directory
+    attr_reader :file, :log_directory, :my_log_directory, :match_log_directory, :proxy_pids_file
 
-    def initialize(file_path, log_directory_, match_log_directory_, interpolation_hash)
+    def initialize(file_path, log_directory_, match_log_directory_, proxy_pids_file_, interpolation_hash)
       @file = file_path
       JSON.parse(File.read(file_path)).each do |constant, val|
         define_singleton_method(constant.to_sym) do
@@ -30,6 +31,7 @@ module AcpcTableManager
       @log_directory = log_directory_
       @match_log_directory = match_log_directory_
       @my_log_directory = File.join(@log_directory, 'acpc_table_manager')
+      @proxy_pids_file = proxy_pids_file_
       @logger = Logger.from_file_name(File.join(@my_log_directory, 'config.log'))
     end
 
@@ -124,6 +126,9 @@ module AcpcTableManager
   @@config_file = nil
   def self.config_file() @@config_file end
 
+  @@notifier = nil
+  def self.notifier() @@notifier end
+
   def self.load_config!(config_data, yaml_directory = File.pwd)
     interpolation_hash = {
       pwd: yaml_directory,
@@ -137,6 +142,7 @@ module AcpcTableManager
       config['table_manager_constants'],
       config['log_directory'],
       config['match_log_directory'],
+      config['proxy_pids_file'],
       interpolation_hash
     )
     @@exhibition_config = ExhibitionConfig.new(
@@ -145,7 +151,11 @@ module AcpcTableManager
       Logger.from_file_name(File.join(@@config.my_log_directory, 'exhibition_config.log'))
     )
 
-    Mongoid.logger = Logger.from_file_name(File.join(@@config.log_directory, 'mongoid.log'))
+    # Moped.logger = Logger.from_file_name(File.join(@@config.log_directory, 'moped.log'))
+    # Mongoid.logger = Logger.from_file_name(File.join(@@config.log_directory, 'mongoid.log'))
+    # TODO: These should be set in configuration files
+    Moped.logger.level = ::Logger::FATAL
+    Mongoid.logger.level = ::Logger::FATAL
     Mongoid.load!(config['mongoid_config'], config['mongoid_env'].to_sym)
 
     if config['error_report']
@@ -156,6 +166,8 @@ module AcpcTableManager
       Rusen.settings.sections = config['error_report']['sections'] || [:backtrace]
       Rusen.settings.email_prefix = config['error_report']['email_prefix'] || '[ERROR] '
       Rusen.settings.smtp_settings = config['error_report']['smtp']
+
+      @@notifier = Rusen
     else
       @@config.log(__method__, {warning: "Email reporting disabled. Please set email configuration to enable this feature."}, Logger::Severity::WARN)
     end
@@ -182,7 +194,7 @@ module AcpcTableManager
   end
 
   def self.notify(exception)
-    Rusen.notify exception
+    @@notifier.notify(exception) if @@notifier
   end
 
   def self.initialized?

data/lib/acpc_table_manager/maintainer.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require_relative 'dealer'
 require_relative 'match'
 
@@ -8,36 +9,103 @@ module AcpcTableManager
   class Maintainer
     include SimpleLogging
 
+    def self.proxy_pids(pids_file)
+      if !File.exists?(pids_file)
+        File.open(pids_file, 'w') do |pids_file|
+          yield pids_file, {} if block_given?
+        end
+      else
+        File.open(pids_file, 'r+') do |pids_file|
+          pids = YAML.safe_load(pids_file) || {}
+          pids_file.seek(0, IO::SEEK_SET)
+          pids_file.truncate(0)
+          yield pids_file, pids if block_given?
+        end
+      end
+    end
+
+    def self.kill_orphan_proxies(pids, pids_file)
+      new_pids = []
+      pids.each do |pid_pair|
+        if AcpcDealer::process_exists?(pid_pair['proxy']) && !AcpcDealer::process_exists?(pid_pair['dealer'])
+          AcpcDealer::kill_process pid_pair['proxy']
+          sleep 1 # Give the process a chance to exit
+
+          if AcpcDealer::process_exists?(pid_pair['proxy'])
+            AcpcDealer::force_kill_process pid_pair['proxy']
+            sleep 1 # Give the process a chance to exit
+
+            if AcpcDealer::process_exists?(pid_pair['proxy'])
+              raise(
+                StandardError.new(
+                  "Proxy process #{pid_pair['proxy']} couldn't be killed!"
+                )
+              )
+            end
+          end
+        else
+          new_pids << pid_pair
+        end
+      end
+      new_pids
+    end
+
+    def self.update_pids(pids)
+      pids, pids_file = proxy_pids proxy_pids_file do |pids_file, pids|
+        pids = kill_orphan_proxies pids, pids_file
+
+        matches_started = yield if block_given?
+
+        matches_started.each do |info|
+          if info
+            pids << {'dealer' => info[:dealer][:pid], 'proxy' => info[:proxy]}
+          end
+        end
+        pids_file.write(YAML.dump(pids)) unless pids.empty?
+      end
+    end
+
+    def self.proxy_pids_file() ::AcpcTableManager.config.proxy_pids_file end
+
     def initialize(logger_ = AcpcTableManager.new_log('table_manager.log'))
       @logger = logger_
-
       @table_queues = {}
-      enqueue_waiting_matches
+
+      maintain!
 
       log(__method__)
     end
 
     def enqueue_waiting_matches(game_definition_key=nil)
+      queues_touched = []
       if game_definition_key
         @table_queues[game_definition_key] ||= ::AcpcTableManager::TableQueue.new(game_definition_key)
         matches_to_check = @table_queues[game_definition_key].my_matches.not_running.and.not_started.to_a
         matches_to_check.each do |m|
           unless @table_queues[game_definition_key].running_matches[m.id.to_s]
-            @table_queues[game_definition_key].enqueue! m.id.to_s, m.dealer_options
+            queues_touched << @table_queues[game_definition_key].enqueue!(m.id.to_s, m.dealer_options)
           end
         end
       else
         ::AcpcTableManager.exhibition_config.games.keys.each do |game_definition_key|
-          enqueue_waiting_matches game_definition_key
+          queues_touched += enqueue_waiting_matches(game_definition_key)
         end
       end
+      queues_touched
     end
 
     def maintain!
       log __method__, msg: "Starting maintenance"
 
-      enqueue_waiting_matches
-      @table_queues.each { |key, queue| queue.check_queue! }
+      self.class().update_pids self.class().proxy_pids_file do
+        queues_touched = enqueue_waiting_matches
+        matches_started = []
+        queues_touched.each do |_, queue|
+          matches_started << queue.check_queue!
+        end
+        matches_started
+      end
+
       clean_up_matches!
 
       log __method__, msg: "Finished maintenance"
@@ -61,7 +129,10 @@ module AcpcTableManager
       rescue Mongoid::Errors::DocumentNotFound
         return kill_match!(match_id)
       else
-        @table_queues[m.game_definition_key.to_s].enqueue! match_id, options
+        self.class().update_pids self.class().proxy_pids_file do
+          @table_queues[m.game_definition_key.to_s].enqueue! match_id, options
+          @table_queues[m.game_definition_key.to_s].check_queue!
+        end
       end
     end
 
@@ -71,7 +142,9 @@ module AcpcTableManager
       rescue Mongoid::Errors::DocumentNotFound
         return kill_match!(match_id)
       else
-        @table_queues[match.game_definition_key.to_s].start_proxy match
+        self.class().update_pids self.class().proxy_pids_file do
+          [@table_queues[match.game_definition_key.to_s].start_proxy(match)]
+        end
       end
     end
 

data/lib/acpc_table_manager/simple_logging.rb

@@ -5,7 +5,7 @@ require 'fileutils'
 class Logger
   # Defaults correspond to Logger#new defaults
   def self.from_file_name(file_name, shift_age = 0, shift_size = 1048576)
-    unless File.exists?(file_name)
+    unless File.exist?(file_name)
       FileUtils.mkdir_p File.dirname(file_name)
       FileUtils.touch file_name
     end

data/lib/acpc_table_manager/table_queue.rb

@@ -55,7 +55,6 @@ module AcpcTableManager
       log(__method__, msg: "Opponents started for #{match.id.to_s}")
 
       start_proxy match
-      self
     end
 
     def start_proxy(match)
@@ -81,6 +80,7 @@ module AcpcTableManager
           pid: @running_matches[match.id.to_s][:proxy]
         }
       )
+      @running_matches[match.id.to_s]
     end
 
     def my_matches
@@ -114,7 +114,7 @@ module AcpcTableManager
       end
     end
 
-    # @return (@see #dequeue!)
+    # @return +self+
     def enqueue!(match_id, dealer_options)
       log(
         __method__,
@@ -127,18 +127,18 @@ module AcpcTableManager
       )
 
       if @running_matches[match_id]
-        return log(
+        log(
           __method__,
           msg: "Match #{match_id} already started!"
         )
+        return self
       end
 
       @matches_to_start << {match_id: match_id, options: dealer_options}
-
-      check_queue!
+      self
     end
 
-    # @return (@see #dequeue!)
+    # @return [Array] The list of PID information about the matches that were dequeued.
     def check_queue!
       log __method__
 
@@ -146,11 +146,14 @@ module AcpcTableManager
 
       log __method__, {num_running_matches: @running_matches.length, num_matches_to_start: @matches_to_start.length}
 
-      if @running_matches.length < AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
-        dequeue!
-      else
-        nil
+      matches_started = []
+      while !@matches_to_start.empty? && @running_matches.length < AcpcTableManager.exhibition_config.games[@game_definition_key]['max_num_matches']
+        matches_started << dequeue
       end
+
+      log __method__, {matches_started: matches_started, num_running_matches: @running_matches.length, num_matches_to_start: @matches_to_start.length}
+
+      matches_started
     end
 
     # @todo Shouldn't be necessary, so this method isn't called right now, but I've written it so I'll leave it for now
@@ -338,8 +341,8 @@ module AcpcTableManager
     end
 
     # @return [Object] The match that has been started or +nil+ if none could
-    # be started.
-    def dequeue!
+    #   be started.
+    def dequeue
       log(
         __method__,
         num_matches_to_start: @matches_to_start.length
@@ -355,12 +358,12 @@ module AcpcTableManager
         begin
           match = Match.find match_id
         rescue Mongoid::Errors::DocumentNotFound
-          return self if @matches_to_start.empty?
+          return nil if @matches_to_start.empty?
         else
           break
         end
       end
-      return self unless match_id
+      return nil unless match_id
 
       options = match_info[:options]
 
@@ -452,6 +455,8 @@ module AcpcTableManager
       )
 
       start_players! match
+
+      @running_matches[match_id]
     end
   end
 end

data/lib/acpc_table_manager/version.rb

@@ -1,3 +1,3 @@
 module AcpcTableManager
-  VERSION = "1.0.9"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acpc_table_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 2.0.0
 platform: ruby
 authors:
 - Dustin Morrill
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-11 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pony
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Backend components to the ACPC Poker GUI Client