dns_one 0.4.28 → 0.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64571ffc92a8fdf06490e52f603abd7664adf14c
-  data.tar.gz: 77b2a458cb3ae1e3106264fae0c588673529fc41
+  metadata.gz: 8ad077556ec78e89b5d4f8a88827dc77bf8397e8
+  data.tar.gz: 8b7916cd71ad40672f8fca7a5baf41b13129c2a8
 SHA512:
-  metadata.gz: bb019c7c0a0064a61204574bd5bfe5ea8547e4b812b14024e644df0c658a414feedd36854dcd95b3de9890f39a905c8f091cfaf4e6984517f25cbd1134da216b
-  data.tar.gz: 766f68aa76fdbe3899748dcd57fa057e5e267725bf7c2ceaba7153b53ea4f923bc634e937a4c7fa6ac803f74c7afda4dc17c6c59398022a4ee12de8f536f4e1b
+  metadata.gz: cc2559f45f107f09ffcf56579890d057104ca176e8c27e9737a793ef754ac2b0a732dd1a84fe324e4b6d8e663c6d5e32426961b631fe92db24233acf9e81fb9a
+  data.tar.gz: 51fe6c09207f7026008300afade6e95675ea93b79d7d2b7506eb1bdba85eee7ad82372ef4edc5b7a82ecb14507a4326c62920a86a8118bf8aba51042a5a14879

data/dns_one.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "rexec", '~> 1.6'
   spec.add_runtime_dependency "pg", '~> 0.21'
   spec.add_runtime_dependency "activerecord", '~> 5.0'
+  spec.add_runtime_dependency "sqlite3", '~> 1.3'
 
 end

data/lib/dns_one.rb

@@ -11,6 +11,7 @@ require 'rubydns'
 require 'yaml'
 require 'pg'
 require 'active_record'
+require 'sqlite3'
 
 # DnsOne
 

data/lib/dns_one/cli.rb

@@ -2,6 +2,7 @@ require "thor"
 
 require "dns_one"
 require "dns_one/setup"
+require 'sqlite3'
 
 class DnsOne::CLI < Thor  
 
@@ -52,4 +53,16 @@ class DnsOne::CLI < Thor
         DnsOne::Util.ensure_sytemd
         DnsOne::Util.run "systemctl status #{DnsOne::Setup::SERVICE_NAME}"
     end
+
+    # STATS
+
+    desc "stats", "show counters"
+    def stats
+        stat = DnsOne::Stat.new(db_file: 'stat.db')
+        [
+            stat.get_counts(:rcode),
+            stat.get_counts(:req_resource),
+            stat.get_counts(:cache)
+        ]
+    end
 end

data/lib/dns_one/server.rb

@@ -15,11 +15,13 @@ module DnsOne; class Server
     def initialize conf, conf_zone_search
         @conf = conf
         @zone_search = ZoneSearch.instance.setup conf_zone_search
+        @stat = Stat.new(db_file: 'stat.db')
     end
 
     def run
         zone_search = @zone_search
         conf = @conf
+        stat = @stat
 
         RubyDNS::run_server(listen: dns_daemon_interfaces, logger: Log.logger) do
             on(:start) do
@@ -31,22 +33,33 @@ module DnsOne; class Server
             end
 
             match(/(.+)/) do |t| # transaction
-                domain_name = t.question.to_s
-                ip_address = t.options[:peer] rescue nil
+                rcode = :NoError
 
-                records = zone_search.query domain_name, t.resource_class, ip_address
+                begin
+                    domain_name = t.question.to_s
+                    ip_address = t.options[:peer] rescue nil
 
-                if records
-                    if records.empty?
-                        t.fail! :NoError
-                    else
-                        records.each do |rec|
-                            t.respond! *[rec.val].flatten, {resource_class: rec.res_class, section: rec.section}
+                    records, from_cache = zone_search.query domain_name, t.resource_class, ip_address
+
+                    if records
+                        if records.empty?
+                            t.fail! :NoError
+                        else
+                            records.each do |rec|
+                                t.respond! *[rec.val].flatten, {resource_class: rec.res_class, section: rec.section}
+                            end
                         end
+                    else
+                        rcode = :NXDomain
+                        t.fail! :NXDomain
                     end
-                else
-                    t.fail! :NXDomain
+                rescue => e
+                    rcode = :ServFail
                 end
+
+                stat.save rcode, t.resource_class, from_cache
+
+                raise e if e
             end
 
             otherwise do |t|

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.28"
+    VERSION = "0.4.29"
 end

data/lib/dns_one/zone_search.rb

@@ -32,7 +32,7 @@ module DnsOne; class ZoneSearch
 
         records = []
 
-        rec_set_name = find_record_set dom_name
+        rec_set_name, from_cache = find_record_set dom_name
         Log.d "domain #{ rec_set_name ? "found, rec_set_name = '#{rec_set_name}'" : 'not found' }"
         return unless rec_set_name
 
@@ -64,7 +64,7 @@ module DnsOne; class ZoneSearch
             records << OpenStruct.new(val: val, res_class: res_class, section: 'answer')
         end
 
-        records
+        [records, from_cache]
     end
 
     private
@@ -102,15 +102,18 @@ module DnsOne; class ZoneSearch
 
         enabled_cache = use_cache && @backend.allow_cache
 
+        from_cache = false
+
         if enabled_cache and rec_set = @cache.find(dom_name)
             Log.d "found in cache (#{@cache.stat})"
-            rec_set
+            from_cache = true
+            [rec_set, from_cache]
         else
             if rec_set = @backend.find(dom_name)
                 if enabled_cache
                     @cache.add dom_name, rec_set 
                 end
-                rec_set
+                [rec_set, from_cache]
             end
         end        
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.28
+  version: 0.4.29
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Instead having a complex data schema to assign record sets to DNS zones,
   dns_one assigns one or a few record sets to many zones. Configure your record sets
   in YML files and fetch your domains from a database or YML backend.