Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001

config/initializers/action_controller.rb

@@ -12,7 +12,7 @@ class ActionController::Base
         ActiveRecord::Base.establish_connection(website_connection(@license))    
         # authenticate_session_token    
         # logger.info "Connecting to - " + @license.subdomain + " - "+ @license.dbhost + "@" + @license.dbschema
-      else8
+      else
         # reconnect_default_db
         logger.info 'License is nil'
         # redirect_to root_url(:host => request.domain) + "store_error"
@@ -50,6 +50,16 @@ class ActionController::Base
     end
   end
 
+  def check_license
+    License.check_license_file 
+  end
+
+  def check_installation
+    if current_company.nil?
+      redirect_to install_path
+    end
+  end
+
   def website_connection(license)
     default_connection.dup.update(:host => license.dbhost, :database => license.dbschema.to_s.downcase,
     :username => license.dbusername, :password => license.dbpassword)

config/initializers/mysql2_adapter.rb

@@ -24,7 +24,7 @@ module ActiveRecord
       end
 
       client = Mysql2::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
+      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], config[:wait_timeout], 0]
       ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
     end
   end