| Chunk |
|---|
| Conflicting content |
|---|
}
if ( null == gelfSender )
{
<<<<<<< HEAD
if (graylogHost == null) {
reportError("Graylog2 hostname is empty!", null, ErrorManager.WRITE_FAILURE);
} else {
try
{
if (graylogHost.startsWith("tcp:")) {
String tcpGraylogHost = graylogHost.substring(4, graylogHost.length());
gelfSender = new GelfTCPSender(tcpGraylogHost, graylogPort);
} else if (graylogHost.startsWith("udp:")) {
String udpGraylogHost = graylogHost.substring(4, graylogHost.length());
gelfSender = new GelfUDPSender(udpGraylogHost, graylogPort);
} else {
gelfSender = new GelfUDPSender(graylogHost, graylogPort);
}
}
catch ( UnknownHostException e )
{
reportError( "Unknown Graylog2 hostname:" + graylogHost, e, ErrorManager.WRITE_FAILURE );
}
catch ( SocketException e )
{
reportError( "Socket exception", e, ErrorManager.WRITE_FAILURE );
}
catch ( IOException e )
{
reportError( "IO exception", e, ErrorManager.WRITE_FAILURE );
}
}
}
=======
if (graylogHost == null && amqpURI == null) {
reportError("Graylog2 hostname and amqp uri are empty!", null, ErrorManager.WRITE_FAILURE);
} else if (graylogHost != null && amqpURI != null) {
reportError("Graylog2 hostname and amqp uri are both informed!", null, ErrorManager.WRITE_FAILURE);
} else {
try
{
if (graylogHost.startsWith("tcp:")) {
String tcpGraylogHost = graylogHost.substring(0, 4);
gelfSender = new GelfTCPSender(tcpGraylogHost, graylogPort);
} else if (graylogHost.startsWith("udp:")) {
String udpGraylogHost = graylogHost.substring(0, 4);
gelfSender = new GelfUDPSender(udpGraylogHost, graylogPort);
} else if (amqpURI != null) {
gelfSender = new GelfAMQPSender(amqpURI, amqpExchangeName, amqpRoutingKey, amqpMaxRetries);
} else {
gelfSender = new GelfUDPSender(graylogHost, graylogPort);
}
}
catch ( UnknownHostException e )
{
reportError( "Unknown Graylog2 hostname:" + graylogHost, e, ErrorManager.WRITE_FAILURE );
}
catch ( SocketException e )
{
reportError( "Socket exception", e, ErrorManager.WRITE_FAILURE );
}
catch ( IOException e )
{
reportError( "IO exception", e, ErrorManager.WRITE_FAILURE );
} catch (URISyntaxException e) {
reportError("AMQP uri exception", e, ErrorManager.WRITE_FAILURE );
} catch (NoSuchAlgorithmException e) {
reportError("AMQP algorithm exception", e, ErrorManager.WRITE_FAILURE );
} catch (KeyManagementException e) {
reportError("AMQP key exception", e, ErrorManager.WRITE_FAILURE );
}
}
}
>>>>>>> f346f4521d7d5902329031a00e8401ad81188bed
if ( null == gelfSender ||
!gelfSender.sendMessage( makeMessage( record ) ) )
{ |
| Solution content |
|---|
}
if ( null == gelfSender )
{
if (graylogHost == null && amqpURI == null) {
reportError("Graylog2 hostname and amqp uri are empty!", null, ErrorManager.WRITE_FAILURE);
} else if (graylogHost != null && amqpURI != null) {
reportError("Graylog2 hostname and amqp uri are both informed!", null, ErrorManager.WRITE_FAILURE);
} else {
try
{
if (graylogHost.startsWith("tcp:")) {
String tcpGraylogHost = graylogHost.substring(4, graylogHost.length());
gelfSender = new GelfTCPSender(tcpGraylogHost, graylogPort);
} else if (graylogHost.startsWith("udp:")) {
String udpGraylogHost = graylogHost.substring(4, graylogHost.length());
gelfSender = new GelfUDPSender(udpGraylogHost, graylogPort);
} else if (amqpURI != null) {
gelfSender = new GelfAMQPSender(amqpURI, amqpExchangeName, amqpRoutingKey, amqpMaxRetries);
} else {
gelfSender = new GelfUDPSender(graylogHost, graylogPort);
}
}
catch ( UnknownHostException e )
{
reportError( "Unknown Graylog2 hostname:" + graylogHost, e, ErrorManager.WRITE_FAILURE );
}
catch ( SocketException e )
{
reportError( "Socket exception", e, ErrorManager.WRITE_FAILURE );
}
catch ( IOException e )
{
reportError( "IO exception", e, ErrorManager.WRITE_FAILURE );
} catch (URISyntaxException e) {
reportError("AMQP uri exception", e, ErrorManager.WRITE_FAILURE );
} catch (NoSuchAlgorithmException e) {
reportError("AMQP algorithm exception", e, ErrorManager.WRITE_FAILURE );
} catch (KeyManagementException e) {
reportError("AMQP key exception", e, ErrorManager.WRITE_FAILURE );
}
}
}
if ( null == gelfSender ||
!gelfSender.sendMessage( makeMessage( record ) ) )
{ |
| File |
|---|
| GelfHandler.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| If statement |