hotwired 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1420623f2d8f3637568742b1a9bc3e988b7326b40704a2da228987f130ffc500
-  data.tar.gz: 7a261a56eccd6451103d071e77ff0fa4a25dda2a07f74ab211ec6fea24aec0bb
+  metadata.gz: cdc82fd81f043f0314acf14c6d994496ab6b715242f9805bf3e66d8de698f9c3
+  data.tar.gz: 6c6fccd48234012e8bb80fbdb1243046a5bf42e141eb451b796cd01a96342b60
 SHA512:
-  metadata.gz: 92bdb2cbbaa8ce871a22265324b64667474135cda7c1bdd6c3b71143813e19692b7c86351f59efa760b35a22c0ccf513c1d9a3d9b24791fcb09c9ae5b89995db
-  data.tar.gz: 8c1707d6cd69f2335e98ad3aad3010a29f87ee8159adacd3c30b47da1106876a54590ea981ba16b0691368a55d82226a4ec06206dd5ef12aa01616985f250ef0
+  metadata.gz: 73dab2a97d0e57b3cd505ee7273b6b68f495c380289128229249395351ab00f84cdb96fea34905cfe23b8ca05485799f22497df7f8d3437fc3c440c01c2491c4
+  data.tar.gz: b212362721b3d79e84021ce97cb44e1322fed38c894fbb20b550542e2f20140ade701dee1b92694007c2fd0ab4e25a01b42f97a9012206241aa231798e9e05d0

data/.idea/hotwired.iml

@@ -40,7 +40,40 @@
   </component>
   <component name="RakeTasksCache">
     <option name="myRootTask">
-      <RakeTaskImpl id="rake" />
+      <RakeTaskImpl id="rake">
+        <subtasks>
+          <RakeTaskImpl description="Build hotwired-0.0.3.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if hotwired-0.0.3.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
+          <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
+          <RakeTaskImpl description="Build and install hotwired-0.0.3.gem into system gems" fullCommand="install" id="install" />
+          <RakeTaskImpl id="install">
+            <subtasks>
+              <RakeTaskImpl description="Build and install hotwired-0.0.3.gem into system gems without network access" fullCommand="install:local" id="local" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="Create tag v0.0.3 and build and push hotwired-0.0.3.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Run RuboCop" fullCommand="rubocop" id="rubocop" />
+          <RakeTaskImpl id="rubocop">
+            <subtasks>
+              <RakeTaskImpl description="Auto-correct RuboCop offenses" fullCommand="rubocop:auto_correct" id="auto_correct" />
+            </subtasks>
+          </RakeTaskImpl>
+          <RakeTaskImpl description="" fullCommand="default" id="default" />
+          <RakeTaskImpl description="" fullCommand="release" id="release" />
+          <RakeTaskImpl id="release">
+            <subtasks>
+              <RakeTaskImpl description="" fullCommand="release:guard_clean" id="guard_clean" />
+              <RakeTaskImpl description="" fullCommand="release:rubygem_push" id="rubygem_push" />
+              <RakeTaskImpl description="" fullCommand="release:source_control_push" id="source_control_push" />
+            </subtasks>
+          </RakeTaskImpl>
+        </subtasks>
+      </RakeTaskImpl>
     </option>
   </component>
 </module>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hotwired (0.0.3)
+    hotwired (0.0.4)
       sequel (~> 5.0)
       slop (~> 4.0)
       snmp (~> 1.3)

data/lib/hotwired/core.rb

@@ -21,7 +21,7 @@ module Hotwired
 
     # 轮询 host 数据
     def poll(opts = {})
-      host = opts.delete :host
+      host = opts.delete(:host)
       raise HotwiredError, "'host' not given" unless host
       hotwire = new(opts)
       result  = hotwire.poll Resolv.getaddress(host)
@@ -41,7 +41,7 @@ module Hotwired
     # 类对象外部调用函数入口
     def run
       # 解析变量
-      cidr = @opts.delete :cidr
+      cidr = @opts.delete(:cidr)
       # @output = @opts.delete :output
 
       # 设置缺省 logger 输出
@@ -51,13 +51,13 @@ module Hotwired
       # end
 
       # 初始化变量及遍历 CIDR
-      poll, ignores = resolve_networks cidr
+      poll, ignores = resolve_networks(cidr)
       # 实例化线程和数据库联结
       @mutex  = Mutex.new
       @db     = DB.new
       threads = []
       # 线程遇到异常及时终止
-      Thread.abort_on_exception = true
+      Thread.abort_on_exception = false
 
       # 遍历待轮询的 IPAddr
       poll.each do |net|
@@ -67,11 +67,11 @@ module Hotwired
           # 清除空闲线程
           while threads.size >= CFG.threads
             threads.delete_if { |thread| not thread.alive? }
-            sleep 0.01
+            sleep 0.02
           end
           # 线程不够则主动添加线程
           threads << Thread.new do
-            result = poll ip
+            result = poll(ip)
             @mutex.synchronize { process result } if result
           end
         end
@@ -80,11 +80,34 @@ module Hotwired
       threads.each { |thread| thread.join }
     end
 
+    # 解析 cidr
+    def resolve_networks(cidr)
+      # 如未接收外部变量则使用缺省值
+      cidr = cidr ? [cidr].flatten : CFG.poll
+
+      # 从 CIDR 中剔除排除清单
+      # 支持数组以及文本形式，数据返回包含2个数组对象的数组
+      [cidr, CFG.ignore].map do |nets|
+        if nets.respond_to? :each
+          nets.map { |net| IPAddr.new net }
+        else
+          out = []
+          File.read(nets).each_line do |net|
+            # 模糊的 IP 地址正则表达式
+            net = net.match(/^([\d.\/]+)$/)
+            out << IPAddr.new(net[1]) if net
+          end
+          out
+        end
+      end
+    end
+
     # 轮询单个 IP 设备信息
     def poll(ip)
       result = nil
       # 实例化 SNMP 对象，批量获取相关监控数据
       snmp = SNMP.new(ip.to_s, @community)
+      # 如有异常则返回 false
       oids = snmp.dbget
 
       if oids
@@ -95,16 +118,16 @@ module Hotwired
         result = { oids: oids, ip: ip, int: "n/a" }
         # 联机查询数据
         index = snmp.ip2index(ip.to_s)
-        int   = snmp.ifdescr(index)
         # 逻辑处理
-        if index
-          if int
-            result[:int] = int.downcase
-          else
+        if index.nil?
+          Log.debug "no ifIndex for #{ip}"
+        else
+          int = snmp.ifdescr(index)
+          if int.nil?
             Log.debug "no ifDescr for #{index} at #{ip}"
+          else
+            result[:int] = int.downcase
           end
-        else
-          Log.debug "no ifIndex for #{ip}"
         end
       end
       # 关闭 SNMP 会话并返回结果
@@ -112,8 +135,17 @@ module Hotwired
       result
     end
 
+    # 解析 IP 关联的主机名
+    def ip2name(ip)
+      Resolv.getname ip rescue ip
+    end
+
     # 新增表记录
     def make_record(opt)
+      # 判断是否存在 sysObjectID，不存在则设置为 nil
+      sys_object_id = opt[:oids][:sysObjectID].empty? ? nil : opt[:oids][:sysObjectID].join(".")
+
+      # 返回数据结构
       {
         ip:              opt[:ip].to_s,
         ptr:             ip2name(opt[:ip].to_s),
@@ -122,7 +154,7 @@ module Hotwired
         oid_sysName:     opt[:oids][:sysName],
         oid_sysLocation: opt[:oids][:sysLocation],
         oid_sysDescr:    opt[:oids][:sysDescr],
-        oid_sysObjectID: opt[:oids][:sysObjectID].join("."),
+        oid_sysObjectID: sys_object_id
       }
     end
 
@@ -206,32 +238,5 @@ module Hotwired
         opt[:oids][:sysName].sub!(/-re[1-9]\./, "-re0.")
         opt
       end
-
-      # 解析 IP 关联的主机名
-      def ip2name(ip)
-        Resolv.getname ip rescue ip
-      end
-
-      # 解析 cidr
-      def resolve_networks(cidr)
-        # 如未接收外部变量则使用缺省值
-        cidr = cidr ? [cidr].flatten : CFG.poll
-
-        # 从 CIDR 中剔除排除清单
-        # 支持数组以及文本形式，数据返回包含2个数组对象的数组
-        [cidr, CFG.ignore].map do |nets|
-          if nets.respond_to? :each
-            nets.map { |net| IPAddr.new net }
-          else
-            out = []
-            File.read(nets).each_line do |net|
-              # 模糊的 IP 地址正则表达式
-              net = net.match(/^([\d.\/]+)$/)
-              out << IPAddr.new(net[1]) if net
-            end
-            out
-          end
-        end
-      end
   end
 end

data/lib/hotwired/snmp.rb

@@ -41,7 +41,8 @@ module Hotwired
       begin
         @snmp.get(oid).each_varbind { |vb| return vb }
       rescue ::SNMP::RequestTimeout, Errno::EACCES
-        false
+        Log.debug "::SNMP::RequestTimeout, Errno::EACCES when get(*oid)"
+        nil
       end
     end
 
@@ -62,9 +63,11 @@ module Hotwired
           end
         end
       rescue ::SNMP::RequestTimeout, Errno::EACCES
-        return false
+        Log.debug "::SNMP::RequestTimeout, Errno::EACCES when mget"
+        return nil
       rescue InvalidResponse
-        return false
+        Log.debug "InvalidResponse when mget(oids = {})"
+        return nil
       end
       result
     end
@@ -100,19 +103,19 @@ module Hotwired
       oids = mget(route: [OID[:ipCidrRouteIfIndex], ip, "255.255.255.255.0.0.0.0.0"].join("."),
                   new:   [OID[:ipAddressIfIndex], UNICAST, IPV4, ip].join("."),
                   old:   [OID[:ipAdEntIfIndex], ip].join("."))
-      return false unless oids
+      return nil unless oids
       # 优先使用 route 命中，如查询不到则进一步尝试使用其他属性
       index = oids[:route]
       index = oids[:new] if (not index.class == ::SNMP::Integer) || (index.to_s == "0")
       index = oids[:old] if (not index.class == ::SNMP::Integer) || (index.to_s == "0")
-      return false unless index.class == ::SNMP::Integer
+      return nil unless index.class == ::SNMP::Integer
       index.to_s
     end
 
     # 查询接口描述
     def ifdescr(index)
       descr = get OID[:ifDescr], index
-      return false unless descr && (descr.value.class == ::SNMP::OctetString)
+      return nil unless descr && (descr.value.class == ::SNMP::OctetString)
       descr.value.to_s
     end
   end

data/lib/hotwired/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hotwired
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotwired
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-17 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strada