Skip to content

Commit 114134a

Browse files
committed
Merge pull request #47 from untergeek/fix/46
Remove reference to "format" in example fixes #46
2 parents 8f646a3 + 3495a26 commit 114134a

File tree

1 file changed

+5
-6
lines changed
  • lib/logstash/outputs

1 file changed

+5
-6
lines changed

lib/logstash/outputs/s3.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
# bucket => "boss_please_open_your_bucket" (required)
5959
# size_file => 2048 (optional)
6060
# time_file => 5 (optional)
61-
# format => "plain" (optional)
6261
# canned_acl => "private" (optional. Options are "private", "public_read", "public_read_write", "authenticated_read". Defaults to "private" )
6362
# }
6463
#
@@ -117,7 +116,7 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
117116
#
118117
# Will generate this file:
119118
# "ls.s3.logstash.local.2015-01-01T00.00.tag_elasticsearch.logstash.kibana.part0.txt"
120-
#
119+
#
121120
config :tags, :validate => :array, :default => []
122121

123122
# Exposed attributes for testing purpose.
@@ -133,7 +132,7 @@ def aws_s3_config
133132
def aws_service_endpoint(region)
134133
# Make the deprecated endpoint_region work
135134
# TODO: (ph) Remove this after deprecation.
136-
135+
137136
if @endpoint_region
138137
region_to_use = @endpoint_region
139138
else
@@ -240,7 +239,7 @@ def test_s3_write
240239
File.delete(test_filename)
241240
end
242241
end
243-
242+
244243
public
245244
def restore_from_crashes
246245
@logger.debug("S3: is attempting to verify previous crashes...")
@@ -288,7 +287,7 @@ def get_temporary_filename(page_counter = 0)
288287

289288
public
290289
def receive(event)
291-
290+
292291
@codec.encode(event)
293292
end
294293

@@ -346,7 +345,7 @@ def handle_event(encoded_event)
346345
else
347346
@logger.debug("S3: tempfile file size report.", :tempfile_size => @tempfile.size, :size_file => @size_file)
348347
end
349-
end
348+
end
350349

351350
write_to_tempfile(encoded_event)
352351
end

0 commit comments

Comments
 (0)