cfgstore 2.2.4 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a0b6ba51f76348c9d0fced84be710fb5766a530f43b0b7fa747fb69e7c32cd5
-  data.tar.gz: f058577fbfd1d8f5d0f453b675da6e19350032b73456956f64f6de4cb23302c2
+  metadata.gz: 520262b4afb15ddfc85b7a168c9368678be064fbd63ea3866ab7b2533a9c5cc0
+  data.tar.gz: 5aca99e7b53c6baea77231c126961009e9c8eceb84c428ebefe563a1370e905f
 SHA512:
-  metadata.gz: 4a920ba2fa3926f1a25af8d1d60edb111b6854f7d31edd045678ab17108a24880c04d4958a4ea9f0729feb4bc9d4e38aacb50b1b29fd1b8f4c2f9f6af37239af
-  data.tar.gz: a1aa0c3c7508ba1f8c02c3fad034665c1d091aecba74e6df3577c8ac7f61ed69fdb558f16362beafd900220b0cd182ce5a606cae2a42d56946927e603eb7f09d
+  metadata.gz: 676db863efb52388adf84b1ac0c6d817a9f76d182c2dd150377a1c950ca5f8114bfe3618f26f3acc67c8d736333a7bcaf33991bc1d5aa0acf7046f2dd6f7246d
+  data.tar.gz: 9bccccd915fb2208a478a92e0293012a9ce9183cd00843c2e3ff7c9b4a386f8ef748e8cd8b8de4aa2c5bcaf7ee84d72cce72c67dfa598ab8d0bc8e846d113e4f

data/lib/app-config.rb

@@ -20,10 +20,8 @@ module App
     module_function
     def init( approot: nil, configdir: 'config', filename: 'cfg', env: ( ENV['APP_ENV'] || 'development' ) )
       raise NoMethodError.new('Config already defined.') if defined?( ::Cfg )
-
       root            = Pathname( approot || Pathname( __FILE__ ).dirname ).expand_path.to_s
       env             = env.to_sym.freeze
-      loglevel        = Kernel.const_get("Logger::#{ ENV['LOG_LEVEL'].upcase }") rescue ( env == :production ? Logger::WARN : Logger::DEBUG )
       config          = SettingsHash.new
       # Все настройки приложения + роуты
       configfile      = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
@@ -35,6 +33,7 @@ module App
       # Кто первый встал, того и тапки.      
       Kernel.const_set('Cfg', config)
       config.merge!( YAML.load_file( configfile ).symbolize_keys ) rescue nil
+# puts "config: #{ config.to_hash.inspect }"
       $0 += "[ #{ config.app.id } ]" if config.app && config.app.id
       config[ :app ]     ||= { id: $0 }
       config.app[ :log ] ||= ENV['APP_LOG']
@@ -42,13 +41,28 @@ module App
       config.merge!({
         root: root,
         env:  env,
-        loglevel: loglevel,
         configdir: "#{ root }/#{ configdir }",
         amqproutes: File.exist?( amqp_routesfile ) ? YAML.load_file( amqp_routesfile ).symbolize_keys : {},
         httproutes: File.exist?( http_routesfile ) ? YAML.load_file( http_routesfile ).symbolize_keys : {}
       })
+# puts "config: #{ config.to_hash.inspect }"
+# require 'pry-byebug'
+# binding.pry
+
+      config[:loglevel] = 
+        begin
+          Kernel.const_get("Logger::#{ 
+              ( ENV['LOG_LEVEL'] || config.app.loglevel || ( env == :production ? :WARN : :DEBUG ) ).to_s.upcase
+          }")
+        rescue
+          Logger::DEBUG
+        end
       config
     end
 
+    def remove
+      Kernel.send( :remove_const, 'Cfg' ) if defined?( Cfg )
+    end
+    
   end
 end

data/lib/app-logger.rb

@@ -65,6 +65,12 @@ module App
       Log.info{"#{ Cfg.env } started. thread #{ Thread.current.object_id }."}
       self
     end
+
+    def remove
+      Kernel.send( :remove_const, 'Log' ) if defined?( Log )
+      Kernel.send( :remove_const, 'Log' ) if defined?( MQLog )
+    end
+    
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfgstore
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.2.6
 platform: ruby
 authors:
 - deemytch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-27 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie