Migrate plugins with server plugin helper #1382
Merged
+231
−119
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… existing one * source_hostname_key * source_address_key These are to show hostname/address clearly to users. This update also marks "include_host_key" as deprecated.
|
@repeatedly Could you review this change? |
tagomoris
force-pushed
the
migrate-plugins-with-server-plugin-helper
branch
from
c1626d2
to
ddd7baa
Compare
|
@repeatedly ping |
repeatedly
reviewed
Dec 21, 2016
| @@ -340,12 +350,31 @@ def check_and_skip_invalid_event(tag, es, remote_host) | |||
| new_es | |||
| end | |||
|
|
|||
| def add_source_host(es, host) | |||
| def add_source_host(es, conn) | |||
There was a problem hiding this comment.
add_source_info or something is better.
| PEERADDR = ['?', '0000', '127.0.0.1', '127.0.0.1'] | ||
| LOCALHOST_HOSTNAME_GETTER = ->(){sock = UDPSocket.new(::Socket::AF_INET); sock.do_not_reverse_lookup = false; sock.connect("127.0.0.1", 2048); sock.peeraddr[2] } | ||
| LOCALHOST_HOSTNAME = LOCALHOST_HOSTNAME_GETTER.call | ||
| DUMMY_SOCK = Struct.new(:remote_host, :remote_addr, :remote_port).new(LOCALHOST_HOSTNAME_GETTER.call, "127.0.0.1", 0) |
There was a problem hiding this comment.
Use LOCALHOST_HOSTNAME instead of LOCALHOST_HOSTNAME_GETTER.call in new
| @server.close | ||
| end | ||
| end | ||
| # class << self |
There was a problem hiding this comment.
Why keep these commented out code?
There was a problem hiding this comment.
I missed to delete these lines... will remove.
|
I pushed commits for review comments. I'll merge this change after CI green. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change updates
in_syslogandin_forward.Updating
in_syslogis to use server plugin helper to enable multi-worker processing.I also added/updated some parameters to inject hostname/address of data source, for consistent parameter names with
in_forward.I also found that
in_forwarddon't have a parameter to inject source host address (not hostname).So I added it too.