fluent-plugin-netflowipfix 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc9297c0b2d769c6f0941d70d6d2b50cc7551f32
-  data.tar.gz: d96ffb0d4179d0ac28f4f5e471db1cf2daf93a58
+  metadata.gz: ffd080d6da500d91c9bfcbc9a815985903a83f1b
+  data.tar.gz: b87b67b5914daafa712349959698de3aa24f9ae9
 SHA512:
-  metadata.gz: 9bd1ccb9ce1074dc7b8d3882e5d4d12f9b56492578a26c536b19e382d52d38b4f0ed2e65bc9974dd3deaa291807fddeaf83f4b0f1ad065e3c5294909fcfe8a12
-  data.tar.gz: 18ed3cf4dacd2ea6a0d1a299939554b16fccdab679fd3b19f321e6cb4a6b38b8e7343e40548738caea0e0320d3634ab02216941d3cecbfcb0a045278a5d79afc
+  metadata.gz: 616a1d280a876a17a08ea30e653087af377812ef9ea1192a7751a1136c17050c34f0f9704df4b3cec7ee7ef54c1cd5b0c2f9a4693e678bd966559523da8f0db7
+  data.tar.gz: 8bc83701ca3391b8b24ddd4b40d4b0f8d6ae1c2732be310b64b0344b004a82e2fdc85014e95c9cb0e756789007093199e3f33674de896578cde67636936b5144

data/fluent-plugin-netflowipfix.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-netflowipfix"
-  spec.version = "1.2.1"
+  spec.version = "1.3.0"
   spec.authors = ["Yves Desharnaus"]
   spec.email   = ["yvesbd@gmail.com"]
 

data/lib/fluent/plugin/in_netflowipfix.rb

@@ -65,6 +65,16 @@ class PortConnection
 			@thread_parser.join
 	end # def stop
 	
+	def restartParser
+		if !@thread_parser.nil?
+			@thread_parser.close
+			@thread_parser.join
+			@thread_parser = nil
+		end
+		@thread_parser = ParserThread.new(@udpQueue, @queuesleep, @eventQueue, @cache_ttl, @definitions, @log)
+		@thread_parser.start
+	end
+	
 	def event_pop
 		@eventQueue.pop
 	end
@@ -120,9 +130,21 @@ end #class PortConnection
 			end
 
 		end		
-		
+
+		def restartConnections
+				@@connections.each do | port, conn |
+					$log.debug "restart parser #{conn.bind}:#{conn.port}"
+					conn.restartParser				
+				end
+					before = GC.stat(:total_freed_objects)
+					GC.start
+					after = GC.stat(:total_freed_objects)
+
+		end		
 
 		def waitForEvents
+			timeStart = Time.now.getutc.to_i
+			nb = 0
 			loop do
 					@@connections.each do | port, conn |
 						if (conn.event_queue_length > 0) 
@@ -133,12 +155,31 @@ end #class PortConnection
 								time = ar[0]
 								record = ar[1]
 								router.emit(conn.tag, EventTime.new(time.to_i), record)
+								# Free up variables for garbage collection
+								ar = nil
+								time = nil
+								record = nil
+								nb = nb + 1
 								nbq = nbq - 1
 								break if nbq == 0
 							end 
 						end
 					end
-					$log.trace "waitForEvents: sleep #{@queuesleep}"
+#					@log.trace "NetflowipfixInput::waitForEvents ObjectSpace.memsize_of(NetflowipfixInput)=#{ObjectSpace.memsize_of(self)}"
+					if Time.now.getutc.to_i - timeStart > 600 # 300 = 5 min
+						restartConnections
+						timeStart = Time.now.getutc.to_i
+					end
+
+					# Garbage collection
+					if nb >= 20
+						nb = 0
+#						debugSpace
+					end
+					before = GC.stat(:total_freed_objects)
+					GC.start
+					after = GC.stat(:total_freed_objects)
+#					$log.trace "waitForEvents: sleep #{@queuesleep}"
 					sleep(@queuesleep)
 
 			end
@@ -175,6 +216,7 @@ class UdpListenerThread
 	
 	
 	def run
+		nb = 0 
 			loop do
 				msg, sender =  @udp_socket.recvfrom(4096)
 				@total = @total + msg.length
@@ -188,6 +230,15 @@ class UdpListenerThread
 #				time = EventTime.new()
 				time = Time.now.getutc
 				@udpQueue << [time, record]
+				# Garbage collection
+				msg = nil
+				sender = nil
+				nb = nb + 1
+				if nb > 100
+					GC.start
+					nb = 0
+				end
+
 			end
 	end
 end # class UdpListenerThread
@@ -212,6 +263,11 @@ class ParserThread
 	end 
 	
 	def close
+		# Garbage collection
+		@parser_v5 = nil
+		@parser_v9 = nil
+		@parser_v10 = nil
+		GC.start
 	end
 	
 	def join
@@ -248,6 +304,14 @@ class ParserThread
 						$log.warn "Unsupported Netflow version v#{version}: #{version.class}"
 				end # case
 
+				# Free up variables for garbage collection
+				ar = @udpQueue.pop
+				version = nil
+				time = nil
+				msg = nil
+				payload = nil
+				host = nil
+
 			end
 		end # loop do
 	end # def run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-netflowipfix
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Yves Desharnaus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake