Introduce socket plugin helper #1356
Conversation
…_id which added in logger
* it's much simpler than using Class.new * it doesn't mask instance methods like #write, #try_write and others
…output methods for ack
|
@repeatedly Could you review this change? |
| @@ -898,9 +900,9 @@ def commit_write(chunk_id, delayed: @delayed_commit, secondary: false) | |||
| @retry_mutex.synchronize do | |||
| if @retry # success to flush chunks in retries | |||
| if secondary | |||
| log.warn "retry succeeded by secondary.", plugin_id: plugin_id, chunk_id: dump_unique_id_hex(chunk_id) | |||
| log.warn "retry succeeded by secondary.", chunk_id: dump_unique_id_hex(chunk_id) | |||
There was a problem hiding this comment.
Why remove plugin_id from the logs? Redundancy?
There was a problem hiding this comment.
Redundancy. Plugin logger fills it automatically now.
| def update_retry_state(chunk_id, using_secondary, error = nil) | ||
| @retry_mutex.synchronize do | ||
| @counters_monitor.synchronize{ @num_errors += 1 } | ||
| chunk_id_hex = dump_unique_id_hex(chunk_id) |
There was a problem hiding this comment.
chunk_id_hex is used in only log message.
Not critical but avoid dump_unique_id_hex is bit better.
There was a problem hiding this comment.
There are almost no pass not to output a log with chunk_id_hex.
It's just:
@retryexists, and- without error (called from
#rollback_commit) - or
@retry.limit?is true (all chunks will be cleared)
- without error (called from
That variable is referred in most cases, so I think it's worth to assign into a variable to reduce code complexity.
|
|
||
| # TODO: implement connection pool for specified host | ||
|
|
||
| def socket_create(host, port, proto: :tcp, **kwargs, &block) |
There was a problem hiding this comment.
How about proto argument is changed to required?
There was a problem hiding this comment.
Good idea. I'll update to socket_create(proto, host, port, **kwargs, &block).
| when :unix | ||
| raise "not implemented yet" | ||
| else | ||
| raise ArgumentError, "invalid protocol" |
There was a problem hiding this comment.
"invalid protocol: #{proto}" is better.
This change introduces socket plugin helper, and migrate
out_forwardto v0.14 API fully with plugin helpers.This change does:
fluent/plugin_helper/socketand#socket_create(_tcp,_udp) methodsout_forwardwith socket/timer/server/thread plugin helpers using#try_writefor at-least-once modeThis change doesn't: