rubypitaya 3.15.3 → 3.17.0

data/lib/rubypitaya/core/database_config.rb

@@ -13,6 +13,7 @@ module RubyPitaya
         'encoding' => 'unicode',
         'pool' => setup.fetch('rubypitaya.database.pool', 5),
         'host' => setup['rubypitaya.database.host'],
+        'port' => setup['rubypitaya.database.port'],
         'user' => setup['rubypitaya.database.user'],
         'password' => setup['rubypitaya.database.password'],
         'database' => setup['rubypitaya.database.name'],
@@ -33,6 +34,7 @@ module RubyPitaya
         'encoding': config['encoding'],
         'pool': config['pool'],
         'host': config['host'],
+        'port': config['port'],
         'user': config['user'],
         'password': config['password'],
         'database': config['database'],

data/lib/rubypitaya/core/etcd_connector.rb

@@ -6,7 +6,7 @@ module RubyPitaya
   class EtcdConnector
 
     def initialize(server_uuid, desktop_name, server_name, etcd_prefix,
-                   etcd_address, allow_reconnect, lease_seconds)
+                   etcd_address, allow_reconnect, lease_seconds, log)
       @server_uuid = server_uuid
       @server_name = server_name
       @desktop_name = desktop_name
@@ -14,6 +14,7 @@ module RubyPitaya
       @etcd_address = etcd_address
       @allow_reconnect = allow_reconnect
       @lease_seconds = lease_seconds
+      @log = log
 
       @renew_connection_seconds = lease_seconds / 2.0
 
@@ -27,7 +28,7 @@ module RubyPitaya
       connection_value = get_connection_value
 
       @connection = Etcdv3.new(endpoints: @etcd_address,
-                              allow_reconnect: @allow_reconnect)
+                               allow_reconnect: @allow_reconnect)
 
       @lease = @connection.lease_grant(@lease_seconds)
 
@@ -40,6 +41,7 @@ module RubyPitaya
     end
 
     def disconnect
+      stop_renew_connection
       @connection.del(get_connection_key)
     end
 
@@ -60,15 +62,23 @@ module RubyPitaya
         loop do
           sleep(@renew_connection_seconds)
 
-          @lease = @connection.lease_grant(@lease_seconds)
-          @connection.put(@renew_connection_key, @renew_connection_value,
-                          lease: @lease.ID)
+          begin
+            @lease = @connection.lease_keep_alive_once(@lease.ID)
+
+            if @lease.TTL == 0
+              @lease = @connection.lease_grant(@lease_seconds)
+              @connection.put(@renew_connection_key, @renew_connection_value, lease: @lease.ID)
+            end
+
+          rescue Exception => error
+            @log.error "ETCD RENEW ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
+          end
         end
       end
     end
 
     def stop_renew_connection
-      @renew_connection_thread.exit unless @renew_connection_thread.nil?
+      @renew_connection_thread.exit.join unless @renew_connection_thread.nil?
     end
 
     def get_server_data

data/lib/rubypitaya/core/handler_router.rb

@@ -8,6 +8,8 @@ module RubyPitaya
 
     INVALID_ACTION_NAMES = ['initialize', 'set_attributes']
 
+    attr_reader :handlers
+
     def initialize(is_cheats_enabled)
       @is_cheats_enabled = is_cheats_enabled
 

data/lib/rubypitaya/core/http_routes.rb

@@ -44,7 +44,7 @@ module RubyPitaya
     end
 
     after do
-      ActiveRecord::Base.clear_active_connections!
+      ActiveRecord::Base.connection_handler.clear_active_connections!
     end
 
     private

data/lib/rubypitaya/core/initializer_content.rb

@@ -2,13 +2,14 @@ module RubyPitaya
 
   class InitializerContent
 
-    attr_reader :log, :services, :setup, :config
+    attr_reader :log, :services, :setup, :config, :handlers
 
-    def initialize(log, services, setup, config)
+    def initialize(log, services, setup, config, handlers)
       @log = log
       @services = services
       @setup = setup
       @config = config
+      @handlers = handlers
     end
   end
 end

data/lib/rubypitaya/core/main.rb

@@ -50,12 +50,12 @@ module RubyPitaya
 
       @etcd_prefix = @setup['rubypitaya.etcd.prefix']
       @etcd_address = @setup['rubypitaya.etcd.url']
-      @etcd_lease_seconds = @setup['rubypitaya.etcd.leaseSeconds'].to_i
+      @etcd_lease_seconds = @setup['rubypitaya.etcd.leaseSeconds']
       @allow_reconnect = false
       @etcd_connector = EtcdConnector.new(@service_uuid, @desktop_name,
                                           @server_name, @etcd_prefix,
                                           @etcd_address, @allow_reconnect,
-                                          @etcd_lease_seconds)
+                                          @etcd_lease_seconds, @log)
       @etcd_connector.connect
 
       @nats_address = @setup['rubypitaya.nats.url']
@@ -72,15 +72,16 @@ module RubyPitaya
 
       @services = ServiceHolder.new
 
+      @handler_router = HandlerRouter.new(@is_cheats_enabled)
+
       @initializer_content = InitializerContent.new(@log,
                                                     @services,
                                                     @setup,
-                                                    @config)
+                                                    @config,
+                                                    @handler_router.handlers)
       @initializer_broadcast = InitializerBroadcast.new
       @initializer_broadcast.run(@initializer_content)
 
-      @handler_router = HandlerRouter.new(@is_cheats_enabled)
-
       connect_services
 
       run_http
@@ -148,63 +149,64 @@ module RubyPitaya
     end
 
     def run_nats_connection
-      @nats_connector.connect do |request|
-        start_time_seconds = Time.now.to_f
-
-        message_route = request[:msg][:route]
-        message_data = request[:msg][:data]
-        message_json = JSON.parse(message_data) if !message_data.nil? && !message_data.empty?
-
-        params = Parameters.new(message_json || {})
-
-        session_id = request[:session][:id]
-        session_uid = request[:session].fetch(:uid, '')
-        session_data = request[:session][:data]
-        session_data = JSON.parse(session_data, symbolize_names: true)
-        frontend_id = request[:frontendID]
-        metadata = request[:metadata]
-        metadata = JSON.parse(metadata, symbolize_names: true)
-
-        @session.update(session_id, session_uid, session_data, metadata,
-                        frontend_id)
-
-        handler_name, action_name = message_route.scan(/\A\w+\.(\w+)\.(\w+)\z/)[0]
-
-        @log.info "request  -> route: #{message_route}"
-        @log.info "         -> data:  #{message_data}"
-
-        @config.clear_cache
-
-        response = {}
-
-        begin
-          response = @handler_router.call(handler_name, action_name, @session,
-                                          @postman, @services, @setup, @config,
-                                          @log, params)
-        rescue RouteError => error
-          @log.error "ROUTE ERROR: #{error.code} | #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
-          response = {
-            code: error.code,
-            message: error.message
-          }
-        rescue Exception => error
-          @log.error "INTERNAL ERROR: #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
-          response = {
-            code: StatusCodes::CODE_INTERNAL_ERROR,
-            message: StatusCodes::MESSAGE_INTERNAL_ERROR,
-          }
+      loop do
+        @nats_connector.connect do |request|
+          start_time_seconds = Time.now.to_f
+
+          message_route = request[:msg][:route]
+          message_data = request[:msg][:data]
+          message_json = JSON.parse(message_data) if !message_data.nil? && !message_data.empty?
+
+          params = Parameters.new(message_json || {})
+
+          session_id = request[:session][:id]
+          session_uid = request[:session].fetch(:uid, '')
+          session_data = request[:session][:data]
+          session_data = JSON.parse(session_data, symbolize_names: true)
+          frontend_id = request[:frontendID]
+          metadata = request[:metadata]
+          metadata = JSON.parse(metadata, symbolize_names: true)
+
+          @session.update(session_id, session_uid, session_data, metadata,
+                          frontend_id)
+
+          handler_name, action_name = message_route.scan(/\A\w+\.(\w+)\.(\w+)\z/)[0]
+
+          @log.info "request  -> route: #{message_route}"
+          @log.info "         -> data:  #{message_data}"
+
+          @config.clear_cache
+
+          response = {}
+
+          begin
+            response = @handler_router.call(handler_name, action_name, @session,
+                                            @postman, @services, @setup, @config,
+                                            @log, params)
+          rescue RouteError => error
+            @log.error "ROUTE ERROR: #{error.code} | #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
+            response = {
+              code: error.code,
+              message: error.message
+            }
+          rescue Exception => error
+            @log.error "INTERNAL ERROR: #{error.class} | #{error.message} \n #{error.backtrace.join("\n")}"
+            response = {
+              code: StatusCodes::CODE_INTERNAL_ERROR,
+              message: StatusCodes::MESSAGE_INTERNAL_ERROR,
+            }
+          end
+
+          response_json = JSON.generate(response)
+          delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
+
+          @log.info "response [#{delta_time_seconds}ms] -> #{response_json}"
+
+          response_json
         end
-
-        response_json = JSON.generate(response)
-        delta_time_seconds = ((Time.now.to_f - start_time_seconds) * 1000).round(2)
-
-        @log.info "response [#{delta_time_seconds}ms] -> #{response_json}"
-
-        response_json
+        rescue Exception => error
+          @log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
       end
-      rescue Exception => error
-        @log.error "INTERNAL ERROR: #{error.class} | #{error.message}} \n #{error.backtrace.join("\n")}"
-        run_nats_connection
     end
   end
 end

data/lib/rubypitaya/core/spec-helpers/app_spec_helper.rb

@@ -27,7 +27,8 @@ module RubyPitaya
       @@initializer_content = InitializerContent.new(@@log,
                                                      @@services,
                                                      @@setup,
-                                                     @@config)
+                                                     @@config,
+                                                     @@handler_router.handlers)
       @@initializer_broadcast = InitializerBroadcast.new
       @@initializer_broadcast.run(@@initializer_content)
 

data/lib/rubypitaya/core/spec-helpers/rubypitaya_spec_helper.rb

@@ -22,6 +22,6 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    ActiveRecord::Base.clear_active_connections!
+    ActiveRecord::Base.connection_handler.clear_active_connections!
   end
 end

data/lib/rubypitaya/version.rb

@@ -1,3 +1,3 @@
 module RubyPitaya
-  VERSION = '3.15.3'
+  VERSION = '3.17.0'
 end