dns_one 0.4.30 → 0.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd90da7f26c043c1061527a8d6c317b323a1d63
-  data.tar.gz: 594f84fea313f5092620752731e463bb5b40562c
+  metadata.gz: 86b8305fbb1e6d4c2eec401c5b67ace08e282c2b
+  data.tar.gz: 4cf1e386c035351ba310619da3221df4ba7bd212
 SHA512:
-  metadata.gz: aafba801a40a381693c2fb347668dae193323084ce98af5fc6e424f65ba2a50d37e9f8cba27174970a765ec0d67e4ecdb07a6ecbf3c799f2b7287219cd2c82b3
-  data.tar.gz: d1f868608bd2267eb2451aee3af246f56f2b958a7d15cbe7773eaf2a6bf412892ce621033cd23560daf554c13b99fda7889d30b646b761ccead708287e964f69
+  metadata.gz: 536fb7c338ac4ea364a86601c5c9292e20150306b733b7d7992172a252b5cd84079828d42c755a420fa724cdf22249f7465df1eb73923ed14803feddeec6dce3
+  data.tar.gz: 8c15909797901a1ac9e88482faeca08e70d6d57ea25334d07aaab878011f0bf0776f207492a310927886c229bb57212facfcb2294ac521b1c7cbf1955ea35cfb

data/.gitignore

@@ -13,4 +13,7 @@
 
 dev_conf.yml
 
-*.gem
+*.gem
+
+stat.db
+test.db

data/lib/dns_one/cli.rb

@@ -3,7 +3,6 @@ require "thor"
 require 'sqlite3'
 require "dns_one"
 require "dns_one/setup"
-require "dns_one/stat"
 
 class DnsOne::CLI < Thor  
 
@@ -59,11 +58,6 @@ class DnsOne::CLI < Thor
 
     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)
-        ]
+        DnsOne::Stat.print
     end
 end

data/lib/dns_one/server.rb

@@ -15,7 +15,7 @@ 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')
+        @stat = Stat.new
     end
 
     def run
@@ -30,6 +30,7 @@ module DnsOne; class Server
                     RExec.change_user run_as
                 end
                 Log.i "Running as #{RExec.current_user}"
+                File.chown DnsOne::DnsOne::STAT_DB, RExec.current_user
             end
 
             match(/(.+)/) do |t| # transaction

data/lib/dns_one/setup.rb

@@ -64,6 +64,7 @@ module DnsOne; class Setup
     def mkdirs
         FileUtils.mkdir_p DnsOne::CONF_DIR
         FileUtils.mkdir_p DnsOne::WORK_DIR
+        File.chmod 0755, DnsOne::WORK_DIR
     end
 
     def setup_finished_msg

data/lib/dns_one/stat.rb

@@ -1,7 +1,12 @@
 module DnsOne; class Stat
+    DB_FNAME = "stat.db"
 
     def initialize conf = {}
         @conf = conf
+        
+        # Setup logger and current working dir
+        DnsOne.new
+        
         ensure_db
     end
 
@@ -42,6 +47,49 @@ module DnsOne; class Stat
         counts
     end
 
+    def self.print
+        stat = new(db_file: DnsOne::DnsOne::STAT_DB, readonly: true)
+        %w(rcode req_resource cache).each do |key|
+            puts "--- #{key} ---"
+            stat.get_counts(key.to_sym).each_pair do |k, v|
+                _k = case key
+                when 'rcode'
+                    stat.rcodes[k]
+                when 'req_resource'
+                    stat.request_resources[k]
+                when 'cache'
+                    k == 0 ? :miss : :hit
+                end
+                puts "#{_k || k}\t#{v}"
+            end
+        end
+    end
+
+    def rcodes
+        unless defined? @@rcodes
+            @@rcodes = Hash[ 
+                Resolv::DNS::RCode.constants.map{|c| 
+                    [
+                        Resolv::DNS::RCode.const_get(c), 
+                        const_underscore(c)
+                    ] 
+                } 
+            ]
+        end
+        @@rcodes
+    end
+
+    def request_resources
+        unless defined? @@request_resources
+            @@request_resources = {}
+            %w(A AAAA ANY CNAME HINFO MINFO MX NS PTR SOA TXT WKS).each do |res|
+                val = Object.const_get("Resolv::DNS::Resource::IN::#{res}")::TypeValue
+                @@request_resources[val] = res.downcase
+            end
+        end
+        @@request_resources
+    end
+
     private
 
     def validate_counter counter
@@ -64,8 +112,16 @@ module DnsOne; class Stat
 
     def ensure_db
         new_db = !File.exists?(db_file)
-        @db = SQLite3::Database.new db_file
-        create_tables if new_db
+
+        opts = {}
+        opts[:readonly] = true if @conf[:readonly]
+
+        @db = SQLite3::Database.new db_file, opts
+
+        if new_db
+            File.chmod 0644, db_file
+            create_tables 
+        end
     end
     
     def create_tables
@@ -80,20 +136,16 @@ module DnsOne; class Stat
             );
         SQL
         
-        sqls <<  <<-SQL
-            CREATE INDEX responses_time         ON responses (time);
-        SQL
-
-        sqls <<  <<-SQL
-            CREATE INDEX responses_rcode        ON responses (rcode);
+        sqls << <<-SQL
+            CREATE INDEX responses_time_rcode ON responses (time, rcode);
         SQL
 
-        sqls <<  <<-SQL
-            CREATE INDEX responses_req_resource ON responses (req_resource);
+        sqls << <<-SQL
+            CREATE INDEX responses_time_req_resource ON responses (time, req_resource);
         SQL
 
-        sqls <<  <<-SQL
-            CREATE INDEX responses_cache        ON responses (cache);
+        sqls << <<-SQL
+            CREATE INDEX responses_time_cache ON responses (time, cache);
         SQL
 
         sqls.each{|sql| @db.execute sql }
@@ -101,18 +153,7 @@ module DnsOne; class Stat
 
 
     def db_file
-        @conf[:db_file]
-    end
-
-    def request_resources
-        unless defined? @@request_resources
-            @@request_resources = {}
-            %w(A AAAA ANY CNAME HINFO MINFO MX NS PTR SOA TXT WKS).each do |res|
-                val = Object.const_get("Resolv::DNS::Resource::IN::#{res}")::TypeValue
-                @@request_resources[val] = res.downcase
-            end
-        end
-        @@request_resources
+        DB_FNAME
     end
 
     def const_underscore name
@@ -125,18 +166,5 @@ module DnsOne; class Stat
         name
     end
 
-    def rcodes
-        unless @@rcodes
-            @@rcodes = Hash[ 
-                Resolv::DNS::RCode.constants.map{|c| 
-                    [
-                        Resolv::DNS::RCode.const_get(c), 
-                        const_underscore(c)
-                    ] 
-                } 
-            ]
-        end
-        @@rcodes
-    end
 end; end
 

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.30"
+    VERSION = "0.4.31"
 end

data/lib/dns_one.rb

@@ -23,6 +23,7 @@ require "dns_one/core_ext/hash"
 require "dns_one/log"
 require "dns_one/util"
 require "dns_one/server"
+require "dns_one/stat"
 
 module DnsOne; class DnsOne
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.30
+  version: 0.4.31
 platform: ruby
 authors:
 - Tom Lobato