hq-log-monitor-client 0.1.3 → 0.1.4

data/lib/hq/log-monitor-client/script.rb

@@ -34,11 +34,17 @@ class Script
 			{ :name => :config,
 				:required => true },
 
+			{ :name => :debug,
+				:boolean => true,
+				:required => false },
+
 		]
 
 		@args.empty? \
 			or raise "Extra args on command line"
 
+		@debug = @opts[:debug]
+
 	end
 
 	def read_config
@@ -104,6 +110,8 @@ class Script
 		@service_elems.each do
 			|service_elem|
 
+			debug "==== service #{service_elem["name"]}"
+
 			fileset_elems = service_elem.find("fileset").to_a
 
 			fileset_elems.each do
@@ -137,6 +145,8 @@ class Script
 				file_names.each do
 					|file_name|
 
+					debug "-- file #{file_name}"
+
 					file_mtime = File.mtime file_name
 					file_size = File.size file_name
 
@@ -147,7 +157,14 @@ class Script
 					if cache_file &&
 						file_mtime == cache_file[:mtime] &&
 						file_size == cache_file[:size]
+
+						debug "mtime %s and size %s match, skip" % [
+							file_mtime,
+							file_size,
+						]
+
 						next
+
 					end
 
 					# scan the file for matching lines
@@ -162,7 +179,7 @@ class Script
 								file_io,
 								max_before + max_after + 1
 
-						file_hash = 0
+						file_digest = Digest::MD5.new
 
 						# check if the file has changed
 
@@ -170,46 +187,80 @@ class Script
 
 							if file_size < cache_file[:size]
 
+								debug \
+									"size %s is less than cache size %s" % [
+										file_size,
+										cache_file[:size],
+									]
+
 								changed = true
 
 							else
 
+								debug "scanning start of file"
+
 								changed = false
 
 								cache_file[:lines].times do
+									|line_num|
 
 									line = file_reader.gets
 
 									unless line
+
+										debug \
+											"only read %s lines, previously " \
+											"read %s" % [
+												line_num,
+												cache_file[:lines],
+											]
+
 										changed = true
 										break
+
 									end
 
-									file_hash = [ file_hash, line.hash ].hash
+									file_digest.update line
 
 								end
 
+								file_hash = file_digest.to_s
+
 								if file_hash != cache_file[:hash]
+
+									debug \
+										"hash %s does not match previous " \
+										"value %s" % [
+											file_hash,
+											cache_file[:hash]
+										]
+
 									changed = true
+
 								end
 
 							end
 
-						end
+							# go back to start if it changed
 
-						# go back to start if it changed
+							if changed
+								debug "seeking to start"
+								file_io.seek 0
+								file_reader.reset
+								file_digest = Digest::MD5.new
+							else
+								debug "start of file not changed"
+							end
 
-						if changed
-							file_io.seek 0
-							file_reader.reset
-							file_hash = 0
 						end
 
 						# scan the new part of the file
 
+						debug "searching for events"
+
 						while line = file_reader.gets
 
-							file_hash = [ file_hash, line.hash ].hash
+							file_digest.update line
 
 							# check for a match
 
@@ -261,6 +312,19 @@ class Script
 
 						# save the file's current info in the cache
 
+						file_hash = file_digest.to_s
+
+						file_lines = file_reader.next_line_number
+
+						debug \
+							"updating cache mtime %s, size %s, lines %s, " \
+							"hash %s" % [
+								file_mtime,
+								file_size,
+								file_lines,
+								file_hash,
+							]
+
 						@cache[:files][file_name] = {
 							mtime: file_mtime,
 							size: file_size,
@@ -394,6 +458,11 @@ class Script
 
 	end
 
+	def debug message
+		return unless @debug
+		$stderr.puts message
+	end
+
 end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hq-log-monitor-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hq-tools