bbk-utils 1.1.0.273317 → 1.1.1.275386

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92bd4633caa38405fd9ec5f01f101842716c0808c3bc86776c4880d0120006c1
-  data.tar.gz: 3593415e0eec611b5ca305a4d5ba6f59c92591943b00c9c96415f5bfc6441b4a
+  metadata.gz: d5b57c20cde397113b0bd693a0d807f67a589d38950a70a2d19bd256ddf001cf
+  data.tar.gz: 6dc84e2187add6bf9ae4e1fd73fa1c972f37da608cfbb2fd552a75ecfcb67792
 SHA512:
-  metadata.gz: 90f54d3498b381d24f737147ce5eaf7f5ca717a44c2e830ff307fa41616f5866e5c2f3dba3fe1495904b15da1480d24691f90113c97ede2ea1d4e04c7c7d532c
-  data.tar.gz: 3306151c09eba11399f139134d65457d52d355fd7b23a59cb056ba2a6f901c4e7744d47acb0d56fe5d86ce3441ad1dde05589f46a3b2beb6d2fbdec0d113f399
+  metadata.gz: 04c35f3b0aa31095c6c5f01237892e004e09b6969ba39406ec5a5380b8e8cac3227d6ba75c02169db92eb5b7d42d4cbe4afcae343fcb8b79c662daa38c858ac5
+  data.tar.gz: 7bb51f432ca43270d98e32216aaaf6fad3089e10a4be21342495bd52bfe818664bbcf3b022385c5eb2407c5c891c1079f9b0538311d63e2da97d9e379aacd566

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bbk-utils (1.1.0.273317)
+    bbk-utils (1.1.1.275386)
       activesupport (>= 7.0)
       russian
 
@@ -62,8 +62,8 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     logger (1.6.1)
-    minitest (5.25.1)
-    mutex_m (0.2.0)
+    minitest (5.25.2)
+    mutex_m (0.3.0)
     parallel (1.21.0)
     parser (3.0.3.1)
       ast (~> 2.4.1)

data/lib/bbk/utils/config.rb

@@ -257,7 +257,7 @@ module BBK
 
           # Если данные есть, либо указан тип (нужно для того чтобы переменная была нужного типа)
           if content.present? || item[:type].present?
-            if file = item[:file]
+            if (file = item[:file])
               dirname = File.dirname(file)
               FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
               File.write(file, content)
@@ -276,7 +276,11 @@ module BBK
           elsif item[:required]
             required!(item)
           else
-            item[:value] = content
+            item[:value] = if (file = item[:file]).present? && File.exist?(file)
+              file
+            else
+              content
+            end
           end
         rescue StandardError => e
           msg = "Failed processing #{item[:env]} parameter. #{e.inspect}"

data/lib/bbk/utils/log_formatter.rb

@@ -5,7 +5,6 @@ require 'logger'
 module BBK
   module Utils
     class LogFormatter < ::Logger::Formatter
-
       FORMAT = "%5s [%sUTC #%d] (%s)[%s]: %s\n"
       def call(severity, time, progname, msg)
         line = msg2str(msg).gsub("\n", '\\n')
@@ -13,10 +12,15 @@ module BBK
       end
 
       def thread_id
-        [Thread.current.object_id.to_s, Thread.current.name].compact.join('@')
+        [
+          Thread.current.object_id.to_s,
+          Thread.current.name || thread_name_from_main
+        ].compact.join('@')
       end
 
+      def thread_name_from_main
+        Thread.current[:bbk_thread_id] ||= "#{Thread.main.name}-#{Thread.current.object_id}" if Thread.main.name
+      end
     end
   end
 end
-

data/lib/bbk/utils/version.rb

@@ -3,7 +3,7 @@
 module BBK
   module Utils
 
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbk-utils
 version: !ruby/object:Gem::Version
-  version: 1.1.0.273317
+  version: 1.1.1.275386
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-15 00:00:00.000000000 Z
+date: 2024-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport