diff --git a/src/cluster/Backend.cc b/src/cluster/Backend.cc index 5a2c44bfff..c6e83f345d 100644 --- a/src/cluster/Backend.cc +++ b/src/cluster/Backend.cc @@ -24,7 +24,7 @@ bool detail::LocalEventHandlingStrategy::DoProcessEvent(std::string_view topic, return true; } -void detail::LocalEventHandlingStrategy::DoEnqueueLocalEvent(EventHandlerPtr h, zeek::Args args) { +void detail::LocalEventHandlingStrategy::DoProcessLocalEvent(EventHandlerPtr h, zeek::Args args) { zeek::event_mgr.Enqueue(h, std::move(args)); } @@ -120,7 +120,7 @@ bool Backend::DoPublishLogWrites(const zeek::logging::detail::LogWriteHeader& he } void Backend::EnqueueEvent(EventHandlerPtr h, zeek::Args args) { - event_handling_strategy->EnqueueLocalEvent(h, std::move(args)); + event_handling_strategy->ProcessLocalEvent(h, std::move(args)); } bool Backend::ProcessEvent(std::string_view topic, detail::Event e) { diff --git a/src/cluster/Backend.h b/src/cluster/Backend.h index 9116f8bc76..0f6d1e87dc 100644 --- a/src/cluster/Backend.h +++ b/src/cluster/Backend.h @@ -116,7 +116,7 @@ public: * @param h The event handler to use. * @param args The event arguments. */ - void EnqueueLocalEvent(EventHandlerPtr h, zeek::Args args) { DoEnqueueLocalEvent(h, std::move(args)); } + void ProcessLocalEvent(EventHandlerPtr h, zeek::Args args) { DoProcessLocalEvent(h, std::move(args)); } private: /** @@ -130,12 +130,12 @@ private: virtual bool DoProcessEvent(std::string_view topic, Event e) = 0; /** - * Hook method for implementing EnqueueLocalEvent(). + * Hook method for implementing ProcessLocalEvent(). * * @param h The event handler to use. * @param args The event arguments. */ - virtual void DoEnqueueLocalEvent(EventHandlerPtr h, zeek::Args args) = 0; + virtual void DoProcessLocalEvent(EventHandlerPtr h, zeek::Args args) = 0; }; /** @@ -144,7 +144,7 @@ private: class LocalEventHandlingStrategy : public EventHandlingStrategy { private: bool DoProcessEvent(std::string_view topic, Event e) override; - void DoEnqueueLocalEvent(EventHandlerPtr h, zeek::Args args) override; + void DoProcessLocalEvent(EventHandlerPtr h, zeek::Args args) override; }; /** diff --git a/src/cluster/websocket/WebSocket.cc b/src/cluster/websocket/WebSocket.cc index 3ffd150383..46af5b7b2b 100644 --- a/src/cluster/websocket/WebSocket.cc +++ b/src/cluster/websocket/WebSocket.cc @@ -85,7 +85,7 @@ private: * Events from backends aren't enqueued into the event loop when * running for WebSocket clients. */ - void DoEnqueueLocalEvent(zeek::EventHandlerPtr h, zeek::Args args) override {} + void DoProcessLocalEvent(zeek::EventHandlerPtr h, zeek::Args args) override {} std::string buffer; std::shared_ptr wsc;