about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2018-06-19 03:57:15 +0000
committerEric Wong <e@80x24.org>2018-06-19 23:59:55 +0000
commit4e0f8155a62711ae6762714db77904ca422b7159 (patch)
tree8cfadca05a865d6142c5115cae49348715922c1c
parentc9077a28044b32799dfd512620d25cb3cba0c6c4 (diff)
downloadmogilefs-client-4e0f8155a62711ae6762714db77904ca422b7159.tar.gz
Ruby trunk started warning about more mismatched indentations
starting around r62836.
-rw-r--r--lib/mogilefs/backend.rb4
-rw-r--r--lib/mogilefs/copy_stream.rb6
-rw-r--r--lib/mogilefs/http_file.rb22
3 files changed, 16 insertions, 16 deletions
diff --git a/lib/mogilefs/backend.rb b/lib/mogilefs/backend.rb
index 7f91508..6d5fe17 100644
--- a/lib/mogilefs/backend.rb
+++ b/lib/mogilefs/backend.rb
@@ -335,8 +335,8 @@ class MogileFS::Backend
       end
     end
     nil
-    ensure
-      sockets.each { |io| io.close }
+  ensure
+    sockets.each { |io| io.close }
   end
 
   # Returns a socket connected to a MogileFS tracker.
diff --git a/lib/mogilefs/copy_stream.rb b/lib/mogilefs/copy_stream.rb
index f50bf08..202b2e3 100644
--- a/lib/mogilefs/copy_stream.rb
+++ b/lib/mogilefs/copy_stream.rb
@@ -23,8 +23,8 @@ module MogileFS::CopyStream # :nodoc:
     end
     dst_io.flush if dst_io.respond_to?(:flush)
     written
-    ensure
-      src_io.close if src.respond_to?(:to_str)
-      dst_io.close if dst.respond_to?(:to_str)
+  ensure
+    src_io.close if src.respond_to?(:to_str)
+    dst_io.close if dst.respond_to?(:to_str)
   end
 end
diff --git a/lib/mogilefs/http_file.rb b/lib/mogilefs/http_file.rb
index a58801a..aa0bcf2 100644
--- a/lib/mogilefs/http_file.rb
+++ b/lib/mogilefs/http_file.rb
@@ -83,11 +83,11 @@ class MogileFS::HTTPFile < StringIO
 
   def rewind_or_raise!(uri, err)
     @active.rewind if @active
-    rescue => e
-      msg = "#{uri} failed with #{err.message} (#{err.class}) and " \
-            "retrying is impossible as rewind on " \
-            "#{@active.inspect} failed with: #{e.message} (#{e.class})"
-      raise NonRetryableError, msg, e.backtrace
+  rescue => e
+    msg = "#{uri} failed with #{err.message} (#{err.class}) and " \
+          "retrying is impossible as rewind on " \
+          "#{@active.inspect} failed with: #{e.message} (#{e.class})"
+    raise NonRetryableError, msg, e.backtrace
   end
 
   ##
@@ -127,12 +127,12 @@ class MogileFS::HTTPFile < StringIO
 
     read_response(sock) # raises on errors
     file_size
-    rescue SystemCallError, RetryableError => err
-      rewind_or_raise!(uri, err)
-      raise
-    ensure
-      file.close if file && @big_io != file
-      sock.close if sock
+  rescue SystemCallError, RetryableError => err
+    rewind_or_raise!(uri, err)
+    raise
+  ensure
+    file.close if file && @big_io != file
+    sock.close if sock
   end
 
   def nhp_put(devid, uri)