dns_one 0.5.11 → 0.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f12f10496fca1e19fe6106fb11be22ddeaf59c67
-  data.tar.gz: 1476e1bf132d0c6481affd30c9b6183366674fe4
+  metadata.gz: f81dde3459b31d4c83ba7bb115f03a1ed708b21d
+  data.tar.gz: bb87f0b070fda97d18cfc9923657619d99c257e4
 SHA512:
-  metadata.gz: ea7a2b8153302481094af3cd822c4585bd05b774dcee61bd20d9a63cc47d435362e12d50d3b25db070c1e046d2fba950a4a8b70733d8d0a60d5e61fc21983dfe
-  data.tar.gz: 8149ccdec1a471fd53d02826948a4452dec0b7878c66bd1307e73d678506af11421085464531bc01c3bdd18103a45a0e8e5762960ef1cd0a1228866092fd500f
+  metadata.gz: 91830beaf2f9d7b72ae7b77e2d384b6d53701ee9f99337fa2845c6ea8c0657799ad2017e693164add1b3da7f1e84bff3648a6aa7cf1411e1b65ce4c082c88428
+  data.tar.gz: b85b09c99d752241540905b2f578b7e59bc72f61a5e60426677dbbbcb0c46b3c8092d85aa21ed7ae4716b19a7e6917f5e7e5a7f47f2b35836259dbd0b7392bb5

data/lib/dns_one/req_log/account.rb

@@ -2,15 +2,19 @@ module DnsOne; module ReqLog; class Account
 
     def initialize
         @conf = Global.conf       
+
         @stat = {}
+        @stat_mutex = Mutex.new
+        
         @last_stat = nil
-        @mutex = Mutex.new
-        open_socket
-        reap
+        @last_stat_mutex = Mutex.new
+
+        Thread.new { open_socket }
+        Thread.new { reap }
     end
 
     def on_response ip_address, domain_name, res_class, rcode, resp_log, from_cache
-        @mutex.synchronize {
+        @stat_mutex.synchronize {
             @stat[:requests] ||= 0
             @stat[:requests] += 1
             
@@ -31,48 +35,47 @@ module DnsOne; module ReqLog; class Account
         Global.logger.error e.desc
     end
 
+    def update_last_stat stat
+        if !@allow_update_last_stat
+            @allow_update_last_stat = true
+            return
+        end
+        @last_stat_mutex.synchronize {
+            @last_stat = stat
+        }
+    end
+
     def reap
-        Thread.new do
-            loop do
-                sleep (300 - Time.now.to_f % 300)
-                @mutex.synchronize {
-                    @last_stat = @stat.deep_dup
-                    reset @stat
-                }
-            end
+        loop do
+            sleep (300 - Time.now.to_f % 300)
+            stat = nil
+            @stat_mutex.synchronize { 
+                stat = @stat.deep_dup 
+                reset @stat
+            }
+            update_last_stat stat
+        rescue => e
+            Global.logger.error e.desc
+            sleep 10
         end
     end
 
+    def write_socket sock
+        last_stat = @last_stat_mutex.synchronize{ @last_stat.deep_dup }
+        sock.puts last_stat.to_json
+    rescue => e
+        Global.logger.error e.desc
+    end
+
     def open_socket
-        conf = @conf
-        mutex = @mutex
-        stat = @stat
-        last_stat = @last_stat
-        sock = Thread.new do
-            sleep 1
-            begin
-                Socket.unix_server_loop(Global.conf.log_req_socket_file) do |sock, addr|
-                    Thread.new do
-                        loop do
-                            begin
-                                mutex.synchronize {
-                                    sock.write "#{ last_stat.to_json }\n"
-                                }
-                            rescue Errno::EPIPE => e
-                                break
-                            rescue => e
-                                Global.logger.error e.desc
-                                break
-                            end
-                            Thread.pass
-                            sleep 0.1
-                        end
-                    end
-                end
-            rescue => e
-                Global.logger.error e.desc
+        sleep 1 # wait for UID change before create the socket file
+        Socket.unix_server_loop(Global.conf.log_req_socket_file) do |sock, addr|
+            Thread.new do
+                write_socket sock
             end
         end
+    rescue => e
+        Global.logger.error e.desc
     end
 
     def reset hash

data/lib/dns_one/version.rb

@@ -1,3 +1,3 @@
 module DnsOne
-    VERSION = "0.5.11"
+    VERSION = "0.5.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns_one
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12
 platform: ruby
 authors:
 - Tom Lobato
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler