dns_one 0.4.41 → 0.4.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2805a586bb24e693a6bcd96a71b3c6624c2e7522
-  data.tar.gz: 809f9ee00f0b0b44c891a35a56f113bdb39e8c82
+  metadata.gz: 720e329fe952ba684c4e6001246b8b238dd00d06
+  data.tar.gz: e9a0cfe54c495ecb29c34215fe76f8eb1a4b7f21
 SHA512:
-  metadata.gz: c3b7b3ea1cf801beceb0c57d301e52de456a54d1857aaab3f5d617027e6ab450ed5a99f7c985e81e2e5164d48dfcf14a5ff4f7f07bc846eb2fea3e65ce2c7cdf
-  data.tar.gz: 13e4d4318b16d309db3e1cc5bec5a0d50bc6fe22c66e6ff827be2cc1171828b562013cbe6d4fe9350c83a9a19ab24e44e8f65742b12c9c4d08de03df871ea8ae
+  metadata.gz: 98905e1e4e821f5261d526b2b3e5bf386622dc601dc0a4b86b6896a04f0756cc2d62b81f269ace6816fef6ec84dd4d502d829e31fd535e96dca6f9b8ef5c4bf7
+  data.tar.gz: a0442761bcfb01eae650db2c9d9121a6854f545ac80116a93750eeb990921372a561dec99c0dd24783a121430ab5ae2ca119c2f4bf78ef3dd929605740ab0ef2

data/lib/dns_one.rb

@@ -27,16 +27,12 @@ require "dns_one/stat"
 
 module DnsOne; class DnsOne
 
-    DEFAULT_LOG_FILE = "/var/log/dns_one.log"
     DEFAULT_CONF_FILE = '/etc/dns_one/conf.yml'
     WORK_DIR = "/var/local/dns_one"
     CONF_DIR = "/etc/dns_one"
-    SYSLOG_NAME = 'dns_one'
 
-    def initialize conf_file: nil, log_file: nil, work_dir: nil
-        cmd_log_file = log_file
-        log_file ||= DEFAULT_LOG_FILE
-        Log.setup log_file, SYSLOG_NAME
+    def initialize conf_file: nil, work_dir: nil
+        Log.setup
 
         conf_file ||= DEFAULT_CONF_FILE
         @conf_all = parse_conf conf_file
@@ -44,15 +40,6 @@ module DnsOne; class DnsOne
 
         work_dir ||= WORK_DIR
 
-        # Redefine log file if set in conf file
-        unless cmd_log_file
-            if f = @conf[:log_file].presence 
-                unless Log.change_log_file f
-                    Log.w "Unable to change logfile to #{f}. Will continue with #{Log.log_file_desc}."
-                end
-            end
-        end
-
         begin
             Dir.chdir work_dir
         rescue => e
@@ -74,8 +61,7 @@ module DnsOne; class DnsOne
 
         OpenStruct.new(
             main: {
-                work_dir:           conf[:config][:work_dir],
-                log_file:           conf[:config][:log_file]
+                work_dir:           conf[:config][:work_dir]
             },
             server: {
                 run_as:             conf[:config][:run_as]

data/lib/dns_one/cli.rb

@@ -12,12 +12,10 @@ class DnsOne::CLI < Thor
 
     desc "run", "run server"
     option :conf
-    option :log
     option :work_dir
     def run_srv
         DnsOne::DnsOne.new(
             conf_file: options[:conf], 
-            log_file: options[:log], 
             work_dir: options[:work_dir]
         ).start 
     end

data/lib/dns_one/log.rb

@@ -1,5 +1,7 @@
 
 class Log < Logger
+    SYSLOG_MIN_SEVERITY = Logger::WARN
+
     class << self
 
         # 'def [d|i|w|e|f] msg' for DEBUG INFO WARN ERROR FATAL
@@ -11,19 +13,17 @@ class Log < Logger
             end
         end
 
-        def setup file, syslog_name, syslog_min_severity = Logger::WARN
-            @syslog_min_severity = syslog_min_severity
-            @syslog = Syslog::Logger.new syslog_name
-            @log_file = setfile file
+        def setup
+            @syslog = Syslog::Logger.new "dns_one"
+            @log_file = setfile "/var/log/dns_one.log"
             @logger = Logger.new @log_file
+            @logger.level = Logger::INFO
         end
 
-        def change_log_file file
-            new_log_file = setfile file, allow_stdout: false
-            if new_log_file and new_log_file != @log_file
-                @log_file = new_log_file
-                @logger = Logger.new @log_file
-            end
+        def ruby_dns_logger
+            l = Logger.new setfile("/var/log/dns_one_rubydns.log")
+            l.level = Logger::WARN
+            l
         end
 
         def exc e
@@ -47,13 +47,11 @@ class Log < Logger
 
         private
 
-        def setfile file, allow_stdout: true
-            if [STDOUT, STDERR].include? file or
-               File.writable? file or
-               File.writable? File.dirname(file)
+        def setfile file
+            if File.writable?(file) or File.writable?(File.dirname(file))
                 file
-            elsif allow_stdout
-                STDOUT
+            else
+                STDERR
             end
         end
 
@@ -62,7 +60,7 @@ class Log < Logger
 
             @logger.send met_name, msg
 
-            if severity >= @syslog_min_severity
+            if severity >= SYSLOG_MIN_SEVERITY
                 @syslog.send met_name, msg
             end
 

data/lib/dns_one/server.rb

@@ -22,7 +22,7 @@ module DnsOne; class Server
         conf = @conf
         stat = nil
 
-        RubyDNS::run_server(listen: dns_daemon_interfaces, logger: Log.logger) do
+        RubyDNS::run_server(listen: dns_daemon_interfaces, logger: Log.ruby_dns_logger) do
             on(:start) do
                 if RExec.current_user == 'root'
                     run_as = conf[:run_as] || DEFAULT_RUN_AS
@@ -36,6 +36,7 @@ module DnsOne; class Server
 
             match(/(.+)/) do |t| # transaction
                 rcode = :NoError
+                resp_log = []
 
                 begin
                     domain_name = t.question.to_s
@@ -48,6 +49,7 @@ module DnsOne; class Server
                             t.fail! :NoError
                         else
                             records.each do |rec|
+                                resp_log << rec
                                 t.respond! *[rec.val].flatten, {resource_class: rec.res_class, section: rec.section}
                             end
                         end
@@ -60,6 +62,7 @@ module DnsOne; class Server
                 end
 
                 stat.save rcode, t.resource_class, from_cache
+                Util.log_result ip_address, domain_name, t.resource_class, rcode, resp_log
 
                 raise e if e
             end

data/lib/dns_one/stat.rb

@@ -1,6 +1,7 @@
 module DnsOne; class Stat
     DB_FNAME = "stat.db"
-    SQL_PROF = false
+    META_STAT_ON = false
+    META_STAT_FILE = '/tmp/dnsone_sql_prof.log'
 
     def initialize conf = {}
         @conf = conf
@@ -12,7 +13,7 @@ module DnsOne; class Stat
     end
 
     def save rcode, req_resource, cache
-    	Log.i "saving stat (user: #{ `id -un #{Process.uid}`.strip })"
+    	Log.d "saving stat (user: #{ `id -un #{Process.uid}`.strip })"
         rsql(
             "INSERT INTO responses (time, rcode, req_resource, cache) VALUES (?, ?, ?, ?)", 
             [
@@ -159,21 +160,19 @@ module DnsOne; class Stat
     end
 
     def rsql *sql
-        if SQL_PROF
-            t0 = Time.now
-        end
-
+        t0 = Time.now if META_STAT_ON
         res = @db.execute *sql
+        meta_stats t0, sql if META_STAT_ON
+        res
+    end
 
-        if SQL_PROF
-            @sql_profiler ||= Logger.new '/tmp/dnsone_sql_prof.log'
-            time = Time.now.strftime '%y%m%d-%H%M%S.%L'
-            dur = "%.3f" % ((Time.now - t0) * 1000.0)
-            _sql = [sql].flatten[0].gsub /\n+/, ' '
-            @sql_profiler.info "#{time} #{dur} #{_sql}"
-        end
+    def meta_stats t0, sql
+        time = Time.now.strftime '%y%m%d-%H%M%S.%L'
+        dur = "%.3f" % ((Time.now - t0) * 1000.0)
+        sql = [sql].flatten[0].gsub /\s+/, ' '
 
-        res
+        @meta_stats_log ||= Logger.new META_STAT_FILE
+        @meta_stats_log.info "#{time} #{dur} #{sql}"
     end
 
 end; end

data/lib/dns_one/util.rb

@@ -30,4 +30,22 @@ module DnsOne; class Util; class << self
     constant.to_s.split('::').last
   end
 
+  def log_result ip_address, domain_name, res_class, rcode, resp_log
+    fields = []
+
+    fields << domain_name
+    fields << Util.last_mod(res_class)
+    fields << rcode
+    fields << resp_log.map{ |rec|
+        Util.last_mod(rec.res_class) + 
+        ':' +
+        [rec.val].flatten.join(',')
+    }.join(';')
+    fields << ip_address
+
+    fields.map!{|v| v.blank? ? '-' : v}
+
+    Log.i "result: #{ fields.join ' ' }"
+end
+
 end; end; end

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.41"
+    VERSION = "0.4.42"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.4.41
+  version: 0.4.42
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler