cfgstore 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48930dd22a728c70fa7ae518e32f3421e534befbfb6168abb5e3c1a5913dad78
-  data.tar.gz: 55030b26a02fa3ba35b68af3bbfb8ce8895fa036f3b7e3fc289efd208d32abc6
+  metadata.gz: 694c3f8aefbf7e98f6c727d7629a292ef4b78999478cb7f3000e08e800580374
+  data.tar.gz: 3e347a9dc7620dffd9419eabd98f1de28eba29f8d11e9d7205282e044c18e401
 SHA512:
-  metadata.gz: 003c5624ef1cd315175d360dc08dd7a39ff185637540da12b35ce40091c5dde3a2b58e1ed0bfd0e9faeae79dc889c28df1522a219d67a38f019d59e07284ed69
-  data.tar.gz: a65ea98e9bc4efd5f84f31f62562271c3a5182b7d41a2340abebd025566f62be9697f77e107f718c0b5e7c3b163f880cc05a26ba041cc45c2beca70a37a4bef5
+  metadata.gz: 54a4f23c7fc8f51e4e5c3eb6201c98d732b0ab4b963e23e5beeb5d56ae4104d60f517a311d39c0aee08aa8431a8e23789c77680f8f02f138757d22ecf04eb175
+  data.tar.gz: d4e5eb2fa0e05307aa22cf5b4fce526cacd2e92b77acabe97ab3a57a68cd2f97beb8252442e9949d26571dbf6dd4fde2695d3e9b0d0ea49c5612193ca22cad7f

data/lib/app-config.rb

@@ -21,12 +21,12 @@ module App
     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
+      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"
+      configfile      = "#{ root }/#{ configdir }/#{ filename }.#{ env }.yml"
       amqp_routesfile = "#{ root }/#{ configdir }/amqp.#{ env }.yml"
       http_routesfile = "#{ root }/#{ configdir }/http.#{ env }.yml"
 
@@ -36,8 +36,8 @@ module App
       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']
+      config[ :app ]     ||= { id: $0 }
+      config.app[ :log ] ||= ENV['APP_LOG']
 
       config.merge!({
         root: root,

data/lib/app-logger.rb

@@ -45,11 +45,11 @@ module App
       @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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfgstore
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - deemytch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie