cfgstore 2.2.0 → 2.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8ccc7aedc989edea696ccd3a87bdc41ce206dfac1c2f63019a9c75ffd882262
-  data.tar.gz: ab44ee639006b59f23ad8fccc59c1e15d0f25c0e8bb23d0b9c1251b531db61f1
+  metadata.gz: 2cf0403e92a4ce8e9e64c93a2fdf50c4eca85a948b8fbacd9d0d016950245ac8
+  data.tar.gz: 264a7248f764822438bcc436b3871d0e726fe60137bc28d0c09a6175cc6560c8
 SHA512:
-  metadata.gz: f29ef1e3b1518395f13a5b3b07561d36dbaf8a392e1c34474197a2fdb49dbef40a0038c354cce0a9b3c666ad75a130556282de84db57ea58fdaaa2d11a4d7191
-  data.tar.gz: 8685f344832b2600be19a72fba6eb873c120dc962955b569e5d08a366bf3fe2a3c8a35c592aeee400945056a194121ef85e7ed3f38ff98f674e4daf54e9d054d
+  metadata.gz: c244e26ee00aa47accce4187d166e34c70a4b58f8fd3317423f097b71f2435f8bb8dbc5982411aff1f2d1773e39bb6dee4f5e8511e27f6b3e6f23d41a0986a0a
+  data.tar.gz: 7778fea5cbd94011b48ac05f013c9bc72a9b931409670394d50948cfc674b5f1ade49746bdc46c5286d79d838f437fbdae13aa4782a4cf99da6dbe95dac0a88c

data/lib/app-config.rb

@@ -2,12 +2,10 @@ require 'yaml'
 require 'singleton'
 require 'pathname'
 require 'monkey-hash'
-require_relative 'settings-hash'
 
 module App
 
   ##
-  # Удобный прокси к SettingsHash
   # СДЕЛАТЬ: автоперезагрузку при изменении файла.
 
   module Config
@@ -20,34 +18,49 @@ 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
+      root            = Pathname( approot || Pathname( __FILE__ ).dirname ).expand_path.to_s
+      env             = env.to_sym.freeze
+      config          = {}
       # Все настройки приложения + роуты
-      configfile = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
+      configfile      = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
       amqp_routesfile = "#{ root }/#{ configdir }/amqp.#{ env }.yml"
       http_routesfile = "#{ root }/#{ configdir }/http.#{ env }.yml"
 
       # raise ArgumentError.new("Не найден #{ configfile }!") unless File.exist?( configfile )
       # raise ArgumentError.new("Не найден #{ amqp_routesfile }!") unless File.exist?( amqp_routesfile )
-      # Кто первый встал, того и тапки.      
+      # Кто первый встал, того и тапки.
       Kernel.const_set('Cfg', config)
       config.merge!( YAML.load_file( configfile ).symbolize_keys ) rescue nil
-      $0 += "[ #{ config.app.id } ]" if config.app && config.app.id
-      config.app.id  ||= $0
-      config.app.log ||= ENV['APP_LOG']
+# 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']
 
       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

@@ -5,9 +5,9 @@ require 'monkey-hash'
 # Использует предварительно настроенный Cfg
 
 module App
-  class Logger < Logger
+  class Logger < ::Logger
 
-    attr_accessor :main_formatter, :amqp_formatter
+    attr_accessor :main_formatter, :amqp_formatter, :logdev
 
     def base_formatter
       return proc { |severity, datetime, progname, msg|
@@ -42,14 +42,14 @@ module App
 
       raise 'formatter должны быть Proc' if ! @main_formatter.is_a?(Proc) || ! @amqp_formatter.is_a?(Proc)
 
-      logdev = 
+      @logdev = 
         case dest ||= Cfg.app.log
           when 'stderr', 'syslog', nil
-            $stdout.close
-            $stdout = $stderr
+            # $stdout.close
+            $stdout.reopen $stderr
           when 'stdout'
-            $stderr.close
-            $stderr = $stdout
+            # $stderr.close
+            $stderr.reopen $stdout
           else
             Cfg.app.log = "#{ Cfg.root }/#{ Cfg.app.log }" unless Cfg.app.log =~ %r{^/}
             FileUtils.mkdir_p Pathname.new( Cfg.app.log ).dirname
@@ -59,12 +59,18 @@ module App
             $stdout.reopen logf
             logf
         end
-      super logdev, progname: Cfg.app.progname, level: Cfg.loglevel, formatter: @main_formatter
+      super @logdev, progname: Cfg.app.progname, level: Cfg.loglevel, formatter: @main_formatter
       Kernel.const_set 'Log', self
-      Kernel.const_set 'MQLog', ::Logger.new( logdev, progname: "#{ Cfg.app.progname }+Bunny", level: Cfg.loglevel, formatter: @amqp_formatter )
+      Kernel.const_set 'MQLog', ::Logger.new( @logdev, progname: "#{ Cfg.app.progname }+Bunny", level: Cfg.loglevel, formatter: @amqp_formatter )
       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.0
+  version: 2.2.7
 platform: ruby
 authors:
 - deemytch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -47,12 +47,11 @@ extra_rdoc_files: []
 files:
 - lib/app-config.rb
 - lib/app-logger.rb
-- lib/settings-hash.rb
-homepage: 
+homepage:
 licenses:
 - GPL-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -67,8 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Loads and serves configs.
 test_files: []

data/lib/settings-hash.rb

@@ -1,4 +0,0 @@
-require 'hashie'
-
-class SettingsHash < ::Hashie::Mash
-end