dynflow 1.6.6 → 1.6.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/dynflow/rails/configuration.rb +12 -4
- data/lib/dynflow/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2d535120af429db7ce30df6651ffc033d20e481f9c23652b96298cd53e5de2d7
|
|
4
|
+
data.tar.gz: 0d5c5f4f983bde9ce13afebb26c311673513c8a560fbde22b3472e67f468d770
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 81de21466f1ec2a76ec3396b06256dc873cdfdea62d6d39035e284a5f2e8ea5ed81783202163e86a0dcd38f841333c08de92c52989bc768e9763c9eedcab8e59
|
|
7
|
+
data.tar.gz: cf8c24e19b30475a5325c2e219657dbb625d7d42704250e1f8c001846f1d98c9a74ccb80c83c806c89c0a2f7944577ba8741d0ad963d8c0fb16cd7561af41940
|
|
@@ -127,8 +127,12 @@ module Dynflow
|
|
|
127
127
|
db_pool_size = calculate_db_pool_size(world)
|
|
128
128
|
::ActiveRecord::Base.connection_pool.disconnect!
|
|
129
129
|
|
|
130
|
-
|
|
131
|
-
config =
|
|
130
|
+
base_config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0]
|
|
131
|
+
config = if base_config.respond_to?(:configuration_hash)
|
|
132
|
+
::Dynflow::Utils::IndifferentHash.new(base_config.configuration_hash.dup)
|
|
133
|
+
else
|
|
134
|
+
base_config.config.dup
|
|
135
|
+
end
|
|
132
136
|
config['pool'] = db_pool_size if config['pool'].to_i < db_pool_size
|
|
133
137
|
::ActiveRecord::Base.establish_connection(config)
|
|
134
138
|
end
|
|
@@ -159,8 +163,12 @@ module Dynflow
|
|
|
159
163
|
protected
|
|
160
164
|
|
|
161
165
|
def default_sequel_adapter_options(world)
|
|
162
|
-
|
|
163
|
-
db_config
|
|
166
|
+
base_config = ::ActiveRecord::Base.configurations.configs_for(env_name: ::Rails.env)[0]
|
|
167
|
+
db_config = if base_config.respond_to?(:configuration_hash)
|
|
168
|
+
::Dynflow::Utils::IndifferentHash.new(base_config.configuration_hash.dup)
|
|
169
|
+
else
|
|
170
|
+
base_config.config.dup
|
|
171
|
+
end
|
|
164
172
|
db_config['adapter'] = db_config['adapter'].gsub(/_?makara_?/, '')
|
|
165
173
|
db_config['adapter'] = 'postgres' if db_config['adapter'] == 'postgresql'
|
|
166
174
|
db_config['max_connections'] = calculate_db_pool_size(world) if increase_db_pool_size?
|
data/lib/dynflow/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dynflow
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.6.
|
|
4
|
+
version: 1.6.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ivan Necas
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2022-05-
|
|
12
|
+
date: 2022-05-25 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: multi_json
|