cfgstore 2.2.7 → 2.2.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/app-config.rb +3 -7
- metadata +1 -15
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c797f16240a8dc25a6ea0aea48c7c4a40125f1de221d121ef9cb00b4a485ed9c
|
|
4
|
+
data.tar.gz: fe0b79cc30fd18cb8db96eb7386e303362b47806e84f295bc9923205f4f5206b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6099f710167e47a398786bd343b3279a046e3b686a224c182735179844b815ac319a8d6434da6094cb5b6e93b5d3c45f5bc777b79cd96aa286a716c2fd5002da
|
|
7
|
+
data.tar.gz: fe98b93f2379c5f180455358bff9f00a0e095379335cb9e208379c9c9b8019c11264f21c611a0fbb09aaa3a6edb17d7e41d1617474b49656a4b1a9e2a8fcc35c
|
data/lib/app-config.rb
CHANGED
|
@@ -30,8 +30,7 @@ module App
|
|
|
30
30
|
# raise ArgumentError.new("Не найден #{ amqp_routesfile }!") unless File.exist?( amqp_routesfile )
|
|
31
31
|
# Кто первый встал, того и тапки.
|
|
32
32
|
Kernel.const_set('Cfg', config)
|
|
33
|
-
config.merge!( YAML.load_file( configfile ).
|
|
34
|
-
# puts "config: #{ config.to_hash.inspect }"
|
|
33
|
+
config.merge!( YAML.load_file( configfile ).keys_to_symbols ) rescue nil
|
|
35
34
|
$0 += "[ #{ config.app.id } ]" if config.app? && config.app.id?
|
|
36
35
|
config[ :app ] ||= { id: $0 }
|
|
37
36
|
config.app[ :log ] ||= ENV['APP_LOG']
|
|
@@ -40,12 +39,9 @@ module App
|
|
|
40
39
|
root: root,
|
|
41
40
|
env: env,
|
|
42
41
|
configdir: "#{ root }/#{ configdir }",
|
|
43
|
-
amqproutes: File.exist?( amqp_routesfile ) ? YAML.load_file( amqp_routesfile ).
|
|
44
|
-
httproutes: File.exist?( http_routesfile ) ? YAML.load_file( http_routesfile ).
|
|
42
|
+
amqproutes: File.exist?( amqp_routesfile ) ? YAML.load_file( amqp_routesfile ).keys_to_symbols : {},
|
|
43
|
+
httproutes: File.exist?( http_routesfile ) ? YAML.load_file( http_routesfile ).keys_to_symbols : {}
|
|
45
44
|
})
|
|
46
|
-
# puts "config: #{ config.to_hash.inspect }"
|
|
47
|
-
# require 'pry-byebug'
|
|
48
|
-
# binding.pry
|
|
49
45
|
|
|
50
46
|
config[:loglevel] =
|
|
51
47
|
begin
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cfgstore
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.2.
|
|
4
|
+
version: 2.2.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- deemytch
|
|
@@ -10,20 +10,6 @@ bindir: bin
|
|
|
10
10
|
cert_chain: []
|
|
11
11
|
date: 2020-07-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
|
-
- !ruby/object:Gem::Dependency
|
|
14
|
-
name: hashie
|
|
15
|
-
requirement: !ruby/object:Gem::Requirement
|
|
16
|
-
requirements:
|
|
17
|
-
- - ">="
|
|
18
|
-
- !ruby/object:Gem::Version
|
|
19
|
-
version: '0'
|
|
20
|
-
type: :runtime
|
|
21
|
-
prerelease: false
|
|
22
|
-
version_requirements: !ruby/object:Gem::Requirement
|
|
23
|
-
requirements:
|
|
24
|
-
- - ">="
|
|
25
|
-
- !ruby/object:Gem::Version
|
|
26
|
-
version: '0'
|
|
27
13
|
- !ruby/object:Gem::Dependency
|
|
28
14
|
name: monkey-hash
|
|
29
15
|
requirement: !ruby/object:Gem::Requirement
|