Fixed misc

Add ensure to re-assignment of timezone. Remove unnecessary code.
fluent · Sep 1, 2016 · 9eda447 · 9eda447
1 parent e186971
commit 9eda447
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/lib/fluent/command/unpacker.rb b/lib/fluent/command/unpacker.rb
@@ -163,7 +163,7 @@ def call
       File.open(@path, 'r') do |io|
         i = 1
         Fluent::MessagePackFactory.unpacker(io).each do |(time, record)|
-          print @formatter.format(@path, time, record) # tag is use for tag
+          print @formatter.format(@path, time, record) # path is used for tag
           break if i == @options[:count] && @options[:count] != -1
           i += 1
         end
@@ -195,10 +195,6 @@ class Cat < Head
       count: -1
     }
 
-    def initialize(argv = ARGV)
-      super
-    end
-
     def default_options
       DEFAULT_CAT_OPTIONS
     end

diff --git a/test/command/test_unpacker.rb b/test/command/test_unpacker.rb
@@ -72,6 +72,7 @@ def timezone(timezone = 'UTC')
     old = ENV['TZ']
     ENV['TZ'] = timezone
     yield
+  ensure
     ENV['TZ'] = old
   end
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,6 +72,7 @@ def timezone(timezone = 'UTC') @@
         old = ENV['TZ']
         ENV['TZ'] = timezone
         yield
+      ensure
         ENV['TZ'] = old
       end
@@ Expand Down @@