cfgstore 2.2.4 → 2.2.6
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of cfgstore might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/lib/app-config.rb +17 -3
- data/lib/app-logger.rb +6 -0
- 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: 520262b4afb15ddfc85b7a168c9368678be064fbd63ea3866ab7b2533a9c5cc0
|
4
|
+
data.tar.gz: 5aca99e7b53c6baea77231c126961009e9c8eceb84c428ebefe563a1370e905f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 676db863efb52388adf84b1ac0c6d817a9f76d182c2dd150377a1c950ca5f8114bfe3618f26f3acc67c8d736333a7bcaf33991bc1d5aa0acf7046f2dd6f7246d
|
7
|
+
data.tar.gz: 9bccccd915fb2208a478a92e0293012a9ce9183cd00843c2e3ff7c9b4a386f8ef748e8cd8b8de4aa2c5bcaf7ee84d72cce72c67dfa598ab8d0bc8e846d113e4f
|
data/lib/app-config.rb
CHANGED
@@ -20,10 +20,8 @@ module App
|
|
20
20
|
module_function
|
21
21
|
def init( approot: nil, configdir: 'config', filename: 'cfg', env: ( ENV['APP_ENV'] || 'development' ) )
|
22
22
|
raise NoMethodError.new('Config already defined.') if defined?( ::Cfg )
|
23
|
-
|
24
23
|
root = Pathname( approot || Pathname( __FILE__ ).dirname ).expand_path.to_s
|
25
24
|
env = env.to_sym.freeze
|
26
|
-
loglevel = Kernel.const_get("Logger::#{ ENV['LOG_LEVEL'].upcase }") rescue ( env == :production ? Logger::WARN : Logger::DEBUG )
|
27
25
|
config = SettingsHash.new
|
28
26
|
# Все настройки приложения + роуты
|
29
27
|
configfile = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
|
@@ -35,6 +33,7 @@ module App
|
|
35
33
|
# Кто первый встал, того и тапки.
|
36
34
|
Kernel.const_set('Cfg', config)
|
37
35
|
config.merge!( YAML.load_file( configfile ).symbolize_keys ) rescue nil
|
36
|
+
# puts "config: #{ config.to_hash.inspect }"
|
38
37
|
$0 += "[ #{ config.app.id } ]" if config.app && config.app.id
|
39
38
|
config[ :app ] ||= { id: $0 }
|
40
39
|
config.app[ :log ] ||= ENV['APP_LOG']
|
@@ -42,13 +41,28 @@ module App
|
|
42
41
|
config.merge!({
|
43
42
|
root: root,
|
44
43
|
env: env,
|
45
|
-
loglevel: loglevel,
|
46
44
|
configdir: "#{ root }/#{ configdir }",
|
47
45
|
amqproutes: File.exist?( amqp_routesfile ) ? YAML.load_file( amqp_routesfile ).symbolize_keys : {},
|
48
46
|
httproutes: File.exist?( http_routesfile ) ? YAML.load_file( http_routesfile ).symbolize_keys : {}
|
49
47
|
})
|
48
|
+
# puts "config: #{ config.to_hash.inspect }"
|
49
|
+
# require 'pry-byebug'
|
50
|
+
# binding.pry
|
51
|
+
|
52
|
+
config[:loglevel] =
|
53
|
+
begin
|
54
|
+
Kernel.const_get("Logger::#{
|
55
|
+
( ENV['LOG_LEVEL'] || config.app.loglevel || ( env == :production ? :WARN : :DEBUG ) ).to_s.upcase
|
56
|
+
}")
|
57
|
+
rescue
|
58
|
+
Logger::DEBUG
|
59
|
+
end
|
50
60
|
config
|
51
61
|
end
|
52
62
|
|
63
|
+
def remove
|
64
|
+
Kernel.send( :remove_const, 'Cfg' ) if defined?( Cfg )
|
65
|
+
end
|
66
|
+
|
53
67
|
end
|
54
68
|
end
|
data/lib/app-logger.rb
CHANGED
@@ -65,6 +65,12 @@ module App
|
|
65
65
|
Log.info{"#{ Cfg.env } started. thread #{ Thread.current.object_id }."}
|
66
66
|
self
|
67
67
|
end
|
68
|
+
|
69
|
+
def remove
|
70
|
+
Kernel.send( :remove_const, 'Log' ) if defined?( Log )
|
71
|
+
Kernel.send( :remove_const, 'Log' ) if defined?( MQLog )
|
72
|
+
end
|
73
|
+
|
68
74
|
end
|
69
75
|
|
70
76
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
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.6
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- deemytch
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-05-
|
11
|
+
date: 2020-05-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: hashie
|