Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-05 08:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Small updates and a little standardization for config.h.in naming.

Browse source
This commit is contained in:
Seth Hall 2012-06-17 22:55:11 -04:00
parent 57980c86e6
commit cb7eac212e
7 changed files with 32 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/logging/Manager.cc
View file

@ -17,7 +17,7 @@
#include "writers/Ascii.h"
#include "writers/None.h"
#ifdef INSTALL_ELASTICSEARCH
#ifdef USE_ELASTICSEARCH
#include "writers/ElasticSearch.h"
#endif
@ -40,7 +40,7 @@ WriterDefinition log_writers[] = {
{ BifEnum::Log::WRITER_NONE, "None", 0, writer::None::Instantiate },
{ BifEnum::Log::WRITER_ASCII, "Ascii", 0, writer::Ascii::Instantiate },
#ifdef INSTALL_ELASTICSEARCH
#ifdef USE_ELASTICSEARCH
{ BifEnum::Log::WRITER_ELASTICSEARCH, "ElasticSearch", 0, writer::ElasticSearch::Instantiate },
#endif

6
src/logging/writers/ElasticSearch.cc
View file

@ -2,7 +2,7 @@
#include "config.h"
#ifdef INSTALL_ELASTICSEARCH
#ifdef USE_ELASTICSEARCH
#include <string>
#include <errno.h>
@ -261,7 +261,7 @@ CURL* ElasticSearch::HTTPSetup()
// HTTP 1.1 likes to use chunked encoded transfers, which aren't good for speed. The best (only?) way to disable that is to
// just use HTTP 1.0
curl_easy_setopt(handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
//curl_easy_setopt(handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
return handle;
}
@ -275,8 +275,8 @@ bool ElasticSearch::HTTPSend()
{
CURLcode return_code;
curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDSIZE_LARGE, buffer.Len());
curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDS, buffer.Bytes());
curl_easy_setopt(curl_handle, CURLOPT_POSTFIELDSIZE, buffer.Len());
return_code = curl_easy_perform(curl_handle);
switch ( return_code )