dns_one 0.4.58 → 0.4.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49a375ba0d00d988d0896ad81ee8abe5708dfe73
-  data.tar.gz: 708b5e4145684b5da2f11d0e9d536e2b3502029c
+  metadata.gz: 9f7aff37d7886eb30db71113afa0e7eb6fe5bb8a
+  data.tar.gz: 896af67a899b60acde6bc43a71a5830ccdeed3bf
 SHA512:
-  metadata.gz: 75e4535b90cf3e394476309ad03f88df039708fe521503ac6228fd8b433fff839cd730835207fd60dbcdd52ea8ce0fbb1caf982f6f7619491c5a3796bcdd42b5
-  data.tar.gz: 36902a2b7a18d68371983e7c9ee36ad7dd0122f71b63f869d3d23824fe721debeecf2c78876f3db9d238184466e0b4cd98b2d3799f23431ff331e07b43afad6b
+  metadata.gz: bdb9fd6536e5a3a808320e6fc56481e77610a0838852e0d3bc14cb0f65d5acf78b3dc224b1dcf7c3fb307e28a05a6bf31d8a09863513e3f9ceed69096907d8a3
+  data.tar.gz: cb5f9daf3bfd0fc324662239587bd7fab045b3f781559f7b413d059e99ed2dda9f719ddea20ca2b1b5f4f8501d126485fc16290ddfd8f626dee673ad55ff675f

data/lib/dns_one/server.rb

@@ -4,6 +4,7 @@ require "dns_one/zone_search"
 module DnsOne; class Server
 
     DEFAULT_RUN_AS = "dnsone"
+    DEFAULT_LOG_RESULT_SOCKET_FILE = '/tmp/dns_one_log_result.sock'
 
     DNS_DAEMON_INTERFACES = [
         [:udp, "0.0.0.0", 53],
@@ -15,12 +16,20 @@ module DnsOne; class Server
     def initialize conf, conf_zone_search
         @conf = conf
         @zone_search = ZoneSearch.instance.setup conf_zone_search
+        if conf[:log_result_socket]
+            @log_result_mutex = Mutex.new
+            launch_log_result_socket
+        end
     end
 
     def run
         zone_search = @zone_search
         conf = @conf
         stat = nil
+        if conf[:log_result_socket]
+            log_result = @log_result
+            log_result_mutex = @log_result_mutex
+        end
 
         RubyDNS::run_server(listen: dns_daemon_interfaces, logger: Log.ruby_dns_logger) do
             on(:start) do
@@ -69,6 +78,25 @@ module DnsOne; class Server
                     Util.log_result ip_address, domain_name, t.resource_class, rcode, resp_log, from_cache
                 end
 
+                if conf[:log_result_socket]
+                    log_result_mutex.synchronize {
+                        log_result[:requests] ||= 0
+                        log_result[:requests] += 1
+                        
+                        log_result[:cache] ||= 0
+                        log_result[:cache] += 1 if from_cache
+                        
+                        log_result[:rcode] ||= {}
+                        log_result[:rcode][rcode] ||= 0
+                        log_result[:rcode][rcode] += 1
+    
+                        req_resource = Util.last_mod t.resource_class
+                        log_result[:req_resource] ||= {}
+                        log_result[:req_resource][req_resource] ||= 0
+                        log_result[:req_resource][req_resource] += 1                    
+                    }
+                end
+
                 raise e if e
             end
 
@@ -93,4 +121,30 @@ module DnsOne; class Server
         end
     end
 
+    def launch_log_result_socket
+        log_result = @log_result
+        log_result_mutex = @log_result_mutex
+        sock = Thread.new do
+            Socket.unix_server_loop(conf[:log_result_socket_file] || DEFAULT_LOG_RESULT_SOCKET_FILE) do |sock, addr|
+                Log.i "opened unix socket #{sock}"
+                Thread.new do
+                    loop do
+                        begin
+                            log_result_mutex.synchronize {
+                                sock.write "#{ log_result.to_json }\n"
+                            }
+                        rescue Errno::EPIPE => e
+                            break
+                        rescue => e
+                            Log.e e
+                            break
+                        end
+                        Thread.pass
+                        sleep 0.1
+                    end
+                end
+            end
+        end
+    end
+
 end; end

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.4.58"
+    VERSION = "0.4.59"
 end

data/lib/dns_one.rb

@@ -64,9 +64,10 @@ module DnsOne; class DnsOne
                 work_dir:           conf[:config][:work_dir]
             },
             server: {
-                run_as:             conf[:config][:run_as],
-                log_results:        (conf[:config][:log_results] == '1'),
-                save_stats:           (conf[:config][:save_stats] == '1')
+                run_as:                 conf[:config][:run_as],
+                log_results:            (conf[:config][:log_results]            == '1'),
+                save_stats:             (conf[:config][:save_stats]             == '1'),
+                log_result_socket_file: (conf[:config][:log_result_socket_file] == '1')
             },
             zone_search: {
                 ignore_subdomains:  conf[:config][:ignore_subdomains],

data/util/sample_conf.yml

@@ -6,6 +6,8 @@ config:
   # log_file: /var/log/dns_one.log              # optional, defaults to /var/log/dns_one.log
   log_results: 0
   save_stats: 0
+  log_result_socket: 1
+  # log_result_socket_file: /tmp/dns_one_log_result.sock
 
 backend:
   ############## 

metadata

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