git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add mysql config option wait timeout

Browse Source
This commit is contained in:
Yan
2018-04-23 11:49:36 +06:30
parent 268cae09f5
commit 509d3a2b18
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/my_aes_crypt.rb
View File

@@ -63,7 +63,8 @@ class MyAesCrypt
shop_json = JSON.parse(shop_data) shop_json = JSON.parse(shop_data)
shop_json["data"].each do |j| shop_json["data"].each do |j|
if j["lookup"] == from if j["lookup"] == from
if(j["value"]["key"] == token) # add [0...44] for production cloud for remove \n
if(j["value"]["key"][0...44] == token)
return true return true
end end
end end

2
config/initializers/mysql2_adapter.rb
View File

@@ -24,7 +24,7 @@ module ActiveRecord
end end
client = Mysql2::Client.new(config.symbolize_keys) 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) ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
end end
end end