From 9bf60d2abc56f261dad83f35f918c73a9b7a9665 Mon Sep 17 00:00:00 2001
From: Luke Swithenbank <lswithenbank@freelancer.com>
Date: Mon, 20 Jun 2016 11:18:30 +1000
Subject: [PATCH 1/2] remove delete

---
 .ruby-version              |  1 +
 lib/logstash/outputs/s3.rb | 25 +++----------------------
 2 files changed, 4 insertions(+), 22 deletions(-)
 create mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..fcb56875
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+jruby-1.7
diff --git a/lib/logstash/outputs/s3.rb b/lib/logstash/outputs/s3.rb
index 21eaeafe..1739ad5e 100644
--- a/lib/logstash/outputs/s3.rb
+++ b/lib/logstash/outputs/s3.rb
@@ -13,8 +13,8 @@
 # INFORMATION:
 #
 # This plugin batches and uploads logstash events into Amazon Simple Storage Service (Amazon S3).
-# 
-# Requirements: 
+#
+# Requirements:
 # * Amazon S3 Bucket and S3 Access Permissions (Typically access_key_id and secret_access_key)
 # * S3 PutObject permission
 # * Run logstash as superuser to establish connection
@@ -42,7 +42,7 @@
 # Both time_file and size_file settings can trigger a log "file rotation"
 # A log rotation pushes the current log "part" to s3 and deleted from local temporary storage.
 #
-## If you specify BOTH size_file and time_file then it will create file for each tag (if specified). 
+## If you specify BOTH size_file and time_file then it will create file for each tag (if specified).
 ## When EITHER time_file minutes have elapsed OR log file size > size_file, a log rotation is triggered.
 ##
 ## If you ONLY specify time_file but NOT file_size, one file for each tag (if specified) will be created..
@@ -258,7 +258,6 @@ def test_s3_write
 
     begin
       write_on_bucket(test_filename)
-      delete_on_bucket(test_filename)
     ensure
       File.delete(test_filename)
     end
@@ -454,24 +453,6 @@ def reset_page_counter
     @page_counter = 0
   end
 
-  private
-  def delete_on_bucket(filename)
-    bucket = @s3.buckets[@bucket]
-
-    remote_filename = "#{@prefix}#{File.basename(filename)}"
-
-    @logger.debug("S3: delete file from bucket", :remote_filename => remote_filename, :bucket => @bucket)
-
-    begin
-      # prepare for write the file
-      object = bucket.objects[remote_filename]
-      object.delete
-    rescue AWS::Errors::Base => e
-      @logger.error("S3: AWS error", :error => e)
-      raise LogStash::ConfigurationError, "AWS Configuration Error"
-    end
-  end
-
   private
   def move_file_to_bucket_async(file)
     @logger.debug("S3: Sending the file to the upload queue.", :filename => File.basename(file))

From 5653895bc6b54f916d758e4e395d43155b8e1e9e Mon Sep 17 00:00:00 2001
From: Luke Swithenbank <lswithenbank@freelancer.com>
Date: Mon, 20 Jun 2016 11:30:41 +1000
Subject: [PATCH 2/2] removed ruby version

---
 .ruby-version | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index fcb56875..00000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-jruby-1.7