release-utils fix for ignored logs and normalize empty tags field

logsearch · Jun 26, 2015 · f7d066e · f7d066e
1 parent ea53caf
commit f7d066e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/share/release-utils/logs/elasticsearch-mappings/enumerate b/share/release-utils/logs/elasticsearch-mappings/enumerate
@@ -15,7 +15,9 @@ ARGV.each do | argv |
       logyaml = YAML.load_file(logfile)
 
       logyaml['files'].each do | joblogfile, joblogconfig |
-        if !joblogconfig.has_key? 'fields' or !joblogconfig['fields'].has_key? 'type'
+        if nil == joblogconfig
+          next
+        elsif !joblogconfig.has_key? 'fields' or !joblogconfig['fields'].has_key? 'type'
           $stderr.puts "WARNING: #{joblogfile} from job #{job_name} does not define a type field"
 
           next

diff --git a/share/release-utils/logs/logstash-filters/enumerate b/share/release-utils/logs/logstash-filters/enumerate
@@ -14,7 +14,9 @@ ARGV.each do | argv |
       logyaml = YAML.load_file(logfile)
 
       logyaml['files'].each do | joblogfile, joblogconfig |
-        if !joblogconfig.has_key? 'fields' or !joblogconfig['fields'].has_key? 'type'
+        if nil == joblogconfig
+          next
+        elsif !joblogconfig.has_key? 'fields' or !joblogconfig['fields'].has_key? 'type'
           $stderr.puts "WARNING: #{joblogfile} from job #{job_name} does not define a type field"
 
           next

diff --git a/share/release-utils/logs/logstash-filters/spec.rb b/share/release-utils/logs/logstash-filters/spec.rb
@@ -15,6 +15,7 @@
 
       sample('@message' => split[0]) do
         subject.remove "@version"
+        subject.remove "tags" if [] === subject['tags']
 
         expected.each do | k, v |
           if "@timestamp" == k