net-knocker 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a06a05f3713cda7540c42ceb9d72543471b226bd9874d6d83fc1c1156e8d923
-  data.tar.gz: 55310cefb6bfa19cbaac755de7611fc6ceb320b00cfb60c96f16c9cb1f78f63e
+  metadata.gz: d2b9e2759985d6e60c6ff108157155b7862d703c2e1836284f89f2786e58d199
+  data.tar.gz: dce4cd990ad60f354628f15e83bb2fe9cadfd7d1bb1ea973e7211447711107a7
 SHA512:
-  metadata.gz: 29d2ae81c2db18ff5e7619ff817d1dfd8cad4fffdf0a0d410afecf74ceddde6ba9f614240f8a672fa689774f89666a9995d248073d3d256d03ab5595c846eb63
-  data.tar.gz: 636c3fd921b0a223bad6ab2359559043fd767a6f535e0af0fd2dc55faa407d6532891819b46f03d25d0faf9a5fef9b7f2a93588797cbf9f5bfa41ca696fbe805
+  metadata.gz: 43ae20154a32b3a730952bec81a0b0c5a2159c7038b9d1276e4ff11fbf8edbcfb07ae8b6bfc6021c0d892ec47b797a6db14f2a13a7f496fe221c2bcc5540114b
+  data.tar.gz: 3b3783e2c1d6a7d7b842f6e93f07ad4b0ca2dbe1e759b94e39ea7942c085d3f2b35a7532bbbff77ee8f74bd6fd24b64dfd6bb74ee242089d4ac4337a94f642fa

data/lib/net/knocker/env.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require 'logger'
+require 'net/https'
+require 'uri'
+
 module Net
   class Knocker
     module Env
@@ -36,6 +40,23 @@ module Net
         end
       end
 
+      def info(method = :info, msg)
+        tags = [self.class.name, Process.pid, method.to_s.upcase].join('][')
+        log.send(method, "[#{tags}] #{msg}")
+      end
+
+      def error(msg)
+        info(__method__, msg)
+      end
+
+      def warn(msg)
+        info(__method__, msg)
+      end
+
+      def debug(msg)
+        info(__method__, msg)
+      end
+
       def ssl_certificate
         @ssl_certificate ||= OpenSSL::X509::Certificate.new(env_secret)
       end
@@ -45,13 +66,13 @@ module Net
       end
 
       def log
-        @log ||= if (defined? logger) && (logger.respond_to? :debug)
-                   logger
-                 elsif (defined? Rails.logger) && (Rails.logger.respond_to? :debug)
-                   Rails.logger
-                 else
-                   ::Logger.new($stderr)
-                 end
+        @log  ||= if (defined? logger) && (logger.respond_to? :debug)
+                    logger
+                  elsif (defined? Rails.logger) && (Rails.logger.respond_to? :debug)
+                    Rails.logger
+                  else
+                    ::Logger.new($stderr)
+                  end
       end
     end
   end

data/lib/net/knocker/peer.rb

@@ -3,25 +3,40 @@
 module Net
   class Knocker
     class Peer
-      def self.any?
-        return unless ENV
-
-        Dir['/proc/*/environ']
-          .select { |path| File.readable_real? path }
-          .grep_v(self_patterns)
-          .select do |path|
-            content = File.read(path)
-            env_var_patterns.any? { |pattern| content.include? pattern }
-          end
-          .any?
-      end
-
       def self.env_var_patterns
         @env_var_patterns ||= %W[NET_KNOCKER_URL NET_KNOCKER_SECRET #{ENV['NET_KNOCKER_URL']}].freeze
       end
 
+      # filter out /proc/self/environ, /proc/thread-self/environ, /proc/<PID>/environ" and "/proc/1/environ"
       def self.self_patterns
-        @self_patterns ||= %r{proc/((?:thread-)?self|#{Process.pid})/environ}.freeze
+        @self_patterns ||= %r{proc/((?:thread-)?self|#{Process.pid}|1)/environ}.freeze
+      end
+
+      def self.environ_paths
+        Dir['/proc/*/environ'].grep_v(self_patterns)
+                              .map { |p| Pathname.new(p) }
+                              .compact
+      end
+
+      def self.pid_with_content
+        environ_paths.map do |path|
+          content = begin
+            path.binread
+                .split("\0")
+                .select { |e| env_var_patterns.any? { |p| e.include? p } }
+                .compact
+          rescue StandardError
+            next
+          end
+          pid = path.to_s.split('/').third.to_s
+          [pid, content] unless content.empty? || pid.empty?
+        end
+        .compact
+        .to_h
+      end
+
+      def self.any?(&block)
+        pid_with_content.any?(&block)
       end
     end
   end

data/lib/net/knocker/version.rb

@@ -2,6 +2,6 @@
 
 module Net
   class Knocker
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

data/lib/net/knocker.rb

@@ -3,9 +3,6 @@
 require_relative './knocker/version'
 require_relative './knocker/env'
 require_relative './knocker/peer'
-require 'logger'
-require 'net/https'
-require 'uri'
 
 module Net
   class Knocker
@@ -23,8 +20,13 @@ module Net
       send_request 'PUT'
     end
 
+    def msg_end
+      "to #{url}" unless url.to_s.empty?
+    end
+
     def out
-      return log.info("[#{self.class}:#{Process.pid}] omitting to send a request") if Peer.any?
+      return debug("not sending DELETE request #{msg_end})") if should_omit?
+      return info("sending DELETE request is blocked by PID(s) #{Peer.pid_with_content.keys.join(',')}") if Peer.any?
 
       send_request 'DELETE'
     end
@@ -32,10 +34,10 @@ module Net
     private
 
     def send_request(http_method)
-      return log.info("[#{self.class}:#{Process.pid}] omitting to send a request") if should_omit?
+      return debug("not sending #{http_method} request #{msg_end}") if should_omit?
 
       http_client.send_request(http_method, '/') do |response|
-        log.debug("[#{self.class}][#{__method__}] Public IP: #{response.body} ")
+        debug("[#{self.class}][#{__method__}] Public IP: #{response.body} ")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: net-knocker
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tio Teath
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: