mirror of
https://github.com/zeek/zeek.git
synced 2025-10-04 23:58:20 +00:00
Remove RemoteSerializer and related code/types.
Also removes broccoli from the source tree.
This commit is contained in:
parent
ca1b1dd6bb
commit
dcd6454530
55 changed files with 79 additions and 5834 deletions
|
@ -2,11 +2,12 @@
|
|||
|
||||
#include <algorithm>
|
||||
|
||||
#include "../Event.h"
|
||||
#include "../EventHandler.h"
|
||||
#include "../NetVar.h"
|
||||
#include "../Net.h"
|
||||
#include "../Type.h"
|
||||
#include "Event.h"
|
||||
#include "EventHandler.h"
|
||||
#include "NetVar.h"
|
||||
#include "Net.h"
|
||||
#include "Type.h"
|
||||
#include "File.h"
|
||||
|
||||
#include "broker/Manager.h"
|
||||
#include "threading/Manager.h"
|
||||
|
@ -16,8 +17,8 @@
|
|||
#include "WriterFrontend.h"
|
||||
#include "WriterBackend.h"
|
||||
#include "logging.bif.h"
|
||||
#include "../plugin/Plugin.h"
|
||||
#include "../plugin/Manager.h"
|
||||
#include "plugin/Plugin.h"
|
||||
#include "plugin/Manager.h"
|
||||
|
||||
using namespace logging;
|
||||
|
||||
|
@ -1300,32 +1301,6 @@ bool Manager::WriteFromRemote(EnumVal* id, EnumVal* writer, string path, int num
|
|||
return true;
|
||||
}
|
||||
|
||||
void Manager::SendAllWritersTo(RemoteSerializer::PeerID peer)
|
||||
{
|
||||
auto et = internal_type("Log::Writer")->AsEnumType();
|
||||
|
||||
for ( vector<Stream *>::iterator s = streams.begin(); s != streams.end(); ++s )
|
||||
{
|
||||
Stream* stream = (*s);
|
||||
|
||||
if ( ! (stream && stream->enable_remote) )
|
||||
continue;
|
||||
|
||||
for ( Stream::WriterMap::iterator i = stream->writers.begin();
|
||||
i != stream->writers.end(); i++ )
|
||||
{
|
||||
WriterFrontend* writer = i->second->writer;
|
||||
auto writer_val = et->GetVal(i->first.first);
|
||||
remote_serializer->SendLogCreateWriter(peer, (*s)->id,
|
||||
writer_val,
|
||||
*i->second->info,
|
||||
writer->NumFields(),
|
||||
writer->Fields());
|
||||
Unref(writer_val);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Manager::SendAllWritersTo(const broker::endpoint_info& ei)
|
||||
{
|
||||
auto et = internal_type("Log::Writer")->AsEnumType();
|
||||
|
|
|
@ -10,14 +10,12 @@
|
|||
#include "../Val.h"
|
||||
#include "../Tag.h"
|
||||
#include "../EventHandler.h"
|
||||
#include "../RemoteSerializer.h"
|
||||
#include "../plugin/ComponentManager.h"
|
||||
|
||||
#include "Component.h"
|
||||
#include "WriterBackend.h"
|
||||
|
||||
class SerializationFormat;
|
||||
class RemoteSerializer;
|
||||
class RotationTimer;
|
||||
|
||||
namespace logging {
|
||||
|
@ -234,7 +232,6 @@ protected:
|
|||
friend class WriterFrontend;
|
||||
friend class RotationFinishedMessage;
|
||||
friend class RotationFailedMessage;
|
||||
friend class ::RemoteSerializer;
|
||||
friend class ::RotationTimer;
|
||||
|
||||
// Instantiates a new WriterBackend of the given type (note that
|
||||
|
@ -248,9 +245,6 @@ protected:
|
|||
int num_fields, const threading::Field* const* fields,
|
||||
bool local, bool remote, bool from_remote, const string& instantiating_filter="");
|
||||
|
||||
// Announces all instantiated writers to peer.
|
||||
void SendAllWritersTo(RemoteSerializer::PeerID peer);
|
||||
|
||||
// Signals that a file has been rotated.
|
||||
bool FinishedRotation(WriterFrontend* writer, const char* new_name, const char* old_name,
|
||||
double open, double close, bool success, bool terminating);
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
|
||||
#include "util.h"
|
||||
#include "threading/SerialTypes.h"
|
||||
#include "SerializationFormat.h"
|
||||
|
||||
#include "Manager.h"
|
||||
#include "WriterBackend.h"
|
||||
|
|
|
@ -9,8 +9,6 @@
|
|||
|
||||
#include "Component.h"
|
||||
|
||||
class RemoteSerializer;
|
||||
|
||||
namespace broker { class data; }
|
||||
|
||||
namespace logging {
|
||||
|
|
|
@ -169,12 +169,6 @@ void WriterFrontend::Init(int arg_num_fields, const Field* const * arg_fields)
|
|||
|
||||
if ( remote )
|
||||
{
|
||||
remote_serializer->SendLogCreateWriter(stream,
|
||||
writer,
|
||||
*info,
|
||||
arg_num_fields,
|
||||
arg_fields);
|
||||
|
||||
broker_mgr->PublishLogCreate(stream,
|
||||
writer,
|
||||
*info,
|
||||
|
@ -201,12 +195,6 @@ void WriterFrontend::Write(int arg_num_fields, Value** vals)
|
|||
|
||||
if ( remote )
|
||||
{
|
||||
remote_serializer->SendLogWrite(stream,
|
||||
writer,
|
||||
info->path,
|
||||
num_fields,
|
||||
vals);
|
||||
|
||||
broker_mgr->PublishLogWrite(stream,
|
||||
writer,
|
||||
info->path,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue