mrpin-sdk 1.0.67 → 1.0.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c58fcd657411dc9578dbcfc84b5f636199f5ef84
-  data.tar.gz: e1c376cae2bc00a37760fd1bf4ddc6e136cda91c
+  metadata.gz: 35e878ab9ad7d51fed9701329bd097ad86ec8f8a
+  data.tar.gz: ed40421a7ea0ce2e6cf9738eeb89255e45a66217
 SHA512:
-  metadata.gz: 938f00f20b13febcdf1626270fe4355cce9fc90161f608a06f74e588772f4bd899f18f91211e74bc718741209f240d25b3eb2ab128b61030d111d3a48a087b07
-  data.tar.gz: 7c4d09ddee9fd2847642f80855f1e54acb709a3930ab7bd41ae76325f66fb829fcf58a7ef15ab7bf98d0245a9d1480aed91c0c40ee83b2b45e3b27f38ed96c9a
+  metadata.gz: d618c1821923815f9d1a400e4924d9a3a4e774b29b328a42ad2d46f7bd19e5a804cce16cc8a522d69e4ddb6ca9b2023a6cdfdffbf33c8512c98b203a2191c4b5
+  data.tar.gz: 4610355794f804be2ee7f81b40e5e592dfc840e7dae5481462da9dc00bd7497fc85c5b03fe45a627ab9d0898ed9c4c968a71215c91f25a8de01a810e5ed0be57

data/lib/mrpin/core/app_info/app_info_base.rb

@@ -24,40 +24,13 @@ class AppInfoBase
   def state=(value)
     return if @state == value
 
+    on_change_state_before(value)
+
     @state = value
 
-    unless @logger.nil?
-      @logger.info("app state is #{@state}")
-    end
+    @logger.info("app state is #{@state}") unless @logger.nil?
 
-    case @state
-      when EAppState::EAS_INIT_CONFIG
-        init_config
-      when EAppState::EAS_INIT_MANAGERS
-        init_managers
-      when EAppState::EAS_POST_INIT
-        call_in_all_managers_with_benchmark('[POST_INIT]', 'post_init')
-      when EAppState::EAS_LOAD_INIT_DATA
-        call_in_all_managers_with_benchmark('[LOAD_DATA]', 'load_init_data')
-
-        call_in_all_managers('on_data_loaded')
-      when EAppState::EAS_INIT_PERIODICAL_TASKS
-        init_periodical_tasks
-      when EAppState::EAS_START_MANAGER_TASKS
-        call_in_all_managers('start_tasks', 0.1)
-      when EAppState::EAS_START_REMOTE_SERVERS
-        start_remote_servers
-      when EAppState::EAS_LAUNCH_COMPLETE
-        call_in_all_managers('on_server_started')
-
-        @boot_time = Time.now
-      when EAppState::EAS_MAINTENANCE
-        on_server_maintenance_on
-      when EAppState::EAS_SHUTDOWN_STARTED
-        call_in_all_managers('on_server_shutdown')
-      else
-        #do nothing
-    end
+    on_change_state_after(value)
 
     nil
   end
@@ -101,9 +74,57 @@ class AppInfoBase
   # Events
   #
 
+  protected
+  def on_change_state_before(state)
+    case state
+      when EAppState::EAS_POST_INIT
+        call_in_all_managers_with_benchmark('[POST_INIT]', 'post_init')
+      when EAppState::EAS_LOAD_INIT_DATA
+        call_in_all_managers_with_benchmark('[LOAD_DATA]', 'load_init_data')
+
+        call_in_all_managers('on_data_loaded')
+      when EAppState::EAS_START_MANAGER_TASKS
+        call_in_all_managers('start_tasks', 0.1)
+      when EAppState::EAS_LAUNCH_COMPLETE
+        call_in_all_managers('on_server_started')
+
+        @boot_time = Time.now
+      when EAppState::EAS_SHUTDOWN_STARTED
+        call_in_all_managers('on_server_shutdown')
+      else
+        #do nothing
+    end
+
+    nil
+  end
+
+  protected
+  def on_change_state_after(state)
+    case state
+      when EAppState::EAS_INIT_CONFIG
+        init_config
+      when EAppState::EAS_INIT_MANAGERS
+        init_managers
+      when EAppState::EAS_INIT_PERIODICAL_TASKS
+        init_periodical_tasks
+      when EAppState::EAS_START_REMOTE_SERVERS
+        start_remote_servers
+      when EAppState::EAS_MAINTENANCE
+        on_server_maintenance_on
+      else
+        #do nothing
+    end
+
+    nil
+  end
+
   protected
   def on_server_launch_complete
-    self.state = @config.server_on_maintenance ? EAppState::EAS_MAINTENANCE : EAppState::EAS_LAUNCH_COMPLETE
+    if @config.nil? || @config.server_on_maintenance
+      self.state = EAppState::EAS_MAINTENANCE
+    else
+      self.state = EAppState::EAS_LAUNCH_COMPLETE
+    end
 
     nil
   end

data/lib/mrpin/core/remote/socket/base/manager_remote_socket_base.rb

@@ -76,8 +76,6 @@ class ManagerRemoteSocketBase < ManagerBase
   def post_init
     super
 
-    @manager_scheduler = AppInfo.instance.manager_scheduler
-
     register_classes
     register_handlers
 
@@ -141,13 +139,4 @@ class ManagerRemoteSocketBase < ManagerBase
     nil
   end
 
-  protected
-  def disconnect_all_if_maintenance
-    return unless AppInfo.instance.is_server_on_maintenance?
-
-    self.disconnect_all_with_message(EStringTypeBase::EST_ERROR_SERVER_ON_MAINTENANCE)
-
-    nil
-  end
-
 end

data/lib/mrpin/core/remote/socket/websocket/manager_remote_web_sockets.rb

@@ -99,15 +99,9 @@ class ManagerRemoteWebSockets < ManagerRemoteSocketBase
               params[:tls_options] = tls_options
             end
 
-            callback_disconnect = Proc.new do
-              disconnect_all_if_maintenance
-            end
-
             EM::WebSocket.run(params) do |websocket|
               client           = @class_client.new(websocket)
               client.websocket = websocket
-
-              @manager_scheduler.run_in_background(callback_disconnect)
             end
 
             @logger.info "server #{self.server_type}\tstarted on #{host}:#{port}"

data/mrpin-sdk.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name        = 'mrpin-sdk'
-  spec.version     = '1.0.67'
+  spec.version     = '1.0.68'
   spec.authors     = %w(Gregory Tkach Yakupov Dmitrij)
   spec.email       = %w(gregory.tkach@gmail.com yakupov.dmitrij@gmail.com)
   spec.description = %q{Mrpin sdk for backend development.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mrpin-sdk
 version: !ruby/object:Gem::Version
-  version: 1.0.67
+  version: 1.0.68
 platform: ruby
 authors:
 - Gregory
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler