From a3a8c9bf5a811983a07a5b06102cc12f59cc26ef Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:40:20 +1000 Subject: [PATCH 01/19] Remove unnecessary semi colon --- src/main/java/org/graylog2/inputs/gelf/GELFMessage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/graylog2/inputs/gelf/GELFMessage.java b/src/main/java/org/graylog2/inputs/gelf/GELFMessage.java index 8cff55ac6015..805c3a19eb0a 100644 --- a/src/main/java/org/graylog2/inputs/gelf/GELFMessage.java +++ b/src/main/java/org/graylog2/inputs/gelf/GELFMessage.java @@ -64,7 +64,7 @@ public enum Type { Type(final byte first, final byte second) { this.first = first; this.second = second; - }; + } static Type determineType(final byte first, final byte second) { if (first == ZLIB.first && second == ZLIB.second) { From 0637c410f4c6fd0b57cf95a57633865e03eaae4a Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:41:17 +1000 Subject: [PATCH 02/19] Remove redundent array creation for varargs method --- .../org/graylog2/indexer/EmbeddedElasticSearchClient.java | 4 ++-- src/main/java/org/graylog2/indexer/Mapping.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java b/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java index 6aaefb6cb5df..59ba20e52d11 100644 --- a/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java +++ b/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java @@ -130,8 +130,8 @@ public boolean bulkIndex(final List messages) { } public boolean deleteMessagesByTimeRange(int to) { - DeleteByQueryRequestBuilder b = client.prepareDeleteByQuery(new String[] {getMainIndexName()}); - b.setTypes(new String[] {TYPE}); + DeleteByQueryRequestBuilder b = client.prepareDeleteByQuery( getMainIndexName() ); + b.setTypes( TYPE ); final QueryBuilder qb = rangeQuery("created_at").from(0).to(to); b.setQuery(qb); ActionFuture future = client.deleteByQuery(b.request()); diff --git a/src/main/java/org/graylog2/indexer/Mapping.java b/src/main/java/org/graylog2/indexer/Mapping.java index da602db42bb6..f02fa0f83171 100644 --- a/src/main/java/org/graylog2/indexer/Mapping.java +++ b/src/main/java/org/graylog2/indexer/Mapping.java @@ -39,7 +39,7 @@ public class Mapping { public static PutMappingRequest getPutMappingRequest(final Client client, final String index) { - final PutMappingRequestBuilder builder = client.admin().indices().preparePutMapping(new String[] {index}); + final PutMappingRequestBuilder builder = client.admin().indices().preparePutMapping( index ); builder.setType(EmbeddedElasticSearchClient.TYPE); final Map mapping = new HashMap(); From 66ee5e7c4cf7b834bc112588dbfebf4689245a7c Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:46:27 +1000 Subject: [PATCH 03/19] Remove unused amqp configuration --- src/main/java/org/graylog2/Configuration.java | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/src/main/java/org/graylog2/Configuration.java b/src/main/java/org/graylog2/Configuration.java index fe649ec95bb4..2b09eb333eb9 100644 --- a/src/main/java/org/graylog2/Configuration.java +++ b/src/main/java/org/graylog2/Configuration.java @@ -123,27 +123,6 @@ public class Configuration { @Parameter(value = "gelf_listen_port", required = true, validator = InetPortValidator.class) private int gelfListenPort = 12201; - @Parameter("amqp_enabled") - private boolean amqpEnabled = false; - - @Parameter("amqp_host") - private String amqpHost = "localhost"; - - @Parameter(value = "amqp_port", validator = InetPortValidator.class) - private int amqpPort = 5672; - - @Parameter(value = "amqp_subscribed_queues", converter = StringListConverter.class) - private List amqpSubscribedQueues; - - @Parameter("amqp_username") - private String amqpUsername = "guest"; - - @Parameter("amqp_password") - private String amqpPassword = "guest"; - - @Parameter("amqp_virtualhost") - private String amqpVirtualhost = "/"; - @Parameter(value = "forwarder_loggly_timeout", validator = PositiveIntegerValidator.class) private int forwarderLogglyTimeout = 3; @@ -297,30 +276,6 @@ public int getGelfListenPort() { return gelfListenPort; } - public boolean isAmqpEnabled() { - return amqpEnabled; - } - - public String getAmqpHost() { - return amqpHost; - } - - public int getAmqpPort() { - return amqpPort; - } - - public String getAmqpUsername() { - return amqpUsername; - } - - public String getAmqpPassword() { - return amqpPassword; - } - - public String getAmqpVirtualhost() { - return amqpVirtualhost; - } - public int getForwarderLogglyTimeout() { return forwarderLogglyTimeout * 1000; } From 0a45e1c12b6a7d4aa7cc8dfd351de5ed806c006d Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:46:49 +1000 Subject: [PATCH 04/19] Remove unused performRetention method --- src/main/java/org/graylog2/Configuration.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/graylog2/Configuration.java b/src/main/java/org/graylog2/Configuration.java index 2b09eb333eb9..b2963ae34148 100644 --- a/src/main/java/org/graylog2/Configuration.java +++ b/src/main/java/org/graylog2/Configuration.java @@ -216,10 +216,6 @@ public int getRecentIndexTtlMinutes() { return recentIndexTtlMinutes; } - public boolean performRetention() { - return !noRetention; - } - public int getOutputBatchSize() { return outputBatchSize; } From ef330e4529779eaf0d190e20e0b616f0fc573e08 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:50:51 +1000 Subject: [PATCH 05/19] Remove redundent initializers --- src/main/java/org/graylog2/Tools.java | 2 +- .../java/org/graylog2/indexer/EmbeddedElasticSearchClient.java | 2 +- .../java/org/graylog2/streams/StreamRuleMatcherFactory.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/graylog2/Tools.java b/src/main/java/org/graylog2/Tools.java index a902e9ca378d..adfa37d6394b 100644 --- a/src/main/java/org/graylog2/Tools.java +++ b/src/main/java/org/graylog2/Tools.java @@ -196,7 +196,7 @@ public static double getUTCTimestampWithMilliseconds(long timestamp) { } public static String getLocalHostname() { - InetAddress addr = null; + InetAddress addr; try { addr = InetAddress.getLocalHost(); } catch (UnknownHostException ex) { diff --git a/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java b/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java index 59ba20e52d11..7472ed1260aa 100644 --- a/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java +++ b/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java @@ -53,7 +53,7 @@ public EmbeddedElasticSearchClient(GraylogServer graylogServer) { final NodeBuilder builder = nodeBuilder().client(true); String esSettings; - Map settings = null; + Map settings; try { esSettings = FileUtils.readFileToString(new File(graylogServer.getConfiguration().getElasticSearchConfigFile())); settings = new YamlSettingsLoader().load(esSettings); diff --git a/src/main/java/org/graylog2/streams/StreamRuleMatcherFactory.java b/src/main/java/org/graylog2/streams/StreamRuleMatcherFactory.java index e051a9e8e836..0e8e4411aac6 100644 --- a/src/main/java/org/graylog2/streams/StreamRuleMatcherFactory.java +++ b/src/main/java/org/graylog2/streams/StreamRuleMatcherFactory.java @@ -28,7 +28,7 @@ public class StreamRuleMatcherFactory { public static StreamRuleMatcher build(int ruleType) throws InvalidStreamRuleTypeException { - StreamRuleMatcher matcher = null; + StreamRuleMatcher matcher; // IMPORTANT: Also add every new rule type to the unit test. switch (ruleType) { From 6aefdf3a64f93260c5f03af82b4a0588f634c438 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:51:15 +1000 Subject: [PATCH 06/19] Remove unused variables --- .../org/graylog2/healthchecks/HealthCheckRequestHandler.java | 1 - .../java/org/graylog2/streams/StreamRuleMatcherFactoryTest.java | 2 +- .../graylog2/streams/matchers/FileNameAndLineMatcherTest.java | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/graylog2/healthchecks/HealthCheckRequestHandler.java b/src/main/java/org/graylog2/healthchecks/HealthCheckRequestHandler.java index b8a9b738867f..4448ee0be3fd 100644 --- a/src/main/java/org/graylog2/healthchecks/HealthCheckRequestHandler.java +++ b/src/main/java/org/graylog2/healthchecks/HealthCheckRequestHandler.java @@ -45,7 +45,6 @@ public class HealthCheckRequestHandler extends SimpleChannelUpstreamHandler { @Override public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception { StringBuilder buffer = new StringBuilder(); - HttpRequest request = (HttpRequest) e.getMessage(); buffer.setLength(0); buffer.append(buildTextResponse()); diff --git a/src/test/java/org/graylog2/streams/StreamRuleMatcherFactoryTest.java b/src/test/java/org/graylog2/streams/StreamRuleMatcherFactoryTest.java index ac81ce2d85f6..a20bdbf7809e 100644 --- a/src/test/java/org/graylog2/streams/StreamRuleMatcherFactoryTest.java +++ b/src/test/java/org/graylog2/streams/StreamRuleMatcherFactoryTest.java @@ -53,7 +53,7 @@ public void testBuild() throws Exception { public void testBuildWithInvalidStreamRuleType() { boolean exceptionThrown = false; try { - StreamRuleMatcher messageMatcher = StreamRuleMatcherFactory.build(9001); + StreamRuleMatcherFactory.build(9001); } catch (InvalidStreamRuleTypeException e) { exceptionThrown = true; } diff --git a/src/test/java/org/graylog2/streams/matchers/FileNameAndLineMatcherTest.java b/src/test/java/org/graylog2/streams/matchers/FileNameAndLineMatcherTest.java index 57c4155c504f..349fa25e25ae 100644 --- a/src/test/java/org/graylog2/streams/matchers/FileNameAndLineMatcherTest.java +++ b/src/test/java/org/graylog2/streams/matchers/FileNameAndLineMatcherTest.java @@ -36,7 +36,6 @@ public void testTheTruthToWork() { @Test public void testSuccessfulMath() { String filename = "main.rb"; - int line = 17; String regex = "^main\\.rb:1\\d"; BasicDBObject mongoRule = new BasicDBObject(); @@ -56,7 +55,6 @@ public void testSuccessfulMath() { @Test public void testSuccessfulMatchWithoutRegex() { String filename = "lol.php"; - int line = 9001; String regex = "lol\\.php:9001"; BasicDBObject mongoRule = new BasicDBObject(); From 3316e19255c4ebd04274263f0f9716f56d59bc9b Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:52:40 +1000 Subject: [PATCH 07/19] Avoid returning a value when return value is unused --- src/main/java/org/graylog2/inputs/gelf/GELFMessageChunk.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/graylog2/inputs/gelf/GELFMessageChunk.java b/src/main/java/org/graylog2/inputs/gelf/GELFMessageChunk.java index 454fd9f0f6da..81d422b95a64 100644 --- a/src/main/java/org/graylog2/inputs/gelf/GELFMessageChunk.java +++ b/src/main/java/org/graylog2/inputs/gelf/GELFMessageChunk.java @@ -109,7 +109,7 @@ private void read() { this.arrival = (int) (System.currentTimeMillis()/1000); } - private String extractId() { + private void extractId() { if (this.id == null) { String tmp = ""; for (int i = 0; i < HEADER_PART_HASH_LENGTH; i++) { @@ -118,8 +118,6 @@ private String extractId() { } this.id = tmp; } - - return this.id; } // lol duplication From 3c83a1f8fcbbcc11dc575dd8578ae35f3a59b1ca Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:54:44 +1000 Subject: [PATCH 08/19] Simplify condition as acknowledged must be true --- .../org/graylog2/indexer/EmbeddedElasticSearchClient.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java b/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java index 7472ed1260aa..42bd4b4448c5 100644 --- a/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java +++ b/src/main/java/org/graylog2/indexer/EmbeddedElasticSearchClient.java @@ -85,8 +85,7 @@ public boolean createIndex() { return false; } final PutMappingRequest mappingRequest = Mapping.getPutMappingRequest(client, getMainIndexName()); - final boolean mappingCreated = client.admin().indices().putMapping(mappingRequest).actionGet().acknowledged(); - return acknowledged && mappingCreated; + return client.admin().indices().putMapping(mappingRequest).actionGet().acknowledged(); } public boolean createRecentIndex() { @@ -103,8 +102,7 @@ public boolean createRecentIndex() { return false; } final PutMappingRequest mappingRequest = Mapping.getPutMappingRequest(client, RECENT_INDEX_NAME); - final boolean mappingCreated = client.admin().indices().putMapping(mappingRequest).actionGet().acknowledged(); - return acknowledged && mappingCreated; + return client.admin().indices().putMapping(mappingRequest).actionGet().acknowledged(); } public boolean bulkIndex(final List messages) { From 74cf3ab4345833a7e3802148508532a4f6a9e6a5 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:56:05 +1000 Subject: [PATCH 09/19] Remove redundent then in multiline if/unless block --- contrib/glassfish_logging/glassfish_to_gelf.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/glassfish_logging/glassfish_to_gelf.rb b/contrib/glassfish_logging/glassfish_to_gelf.rb index 151320c6d68b..9f2011e55512 100644 --- a/contrib/glassfish_logging/glassfish_to_gelf.rb +++ b/contrib/glassfish_logging/glassfish_to_gelf.rb @@ -31,7 +31,7 @@ def transform_level(level) end $stdin.each("#]\n\n") do |line| - if line =~ /^\[#/ then + if line =~ /^\[#/ fields = line.chomp.split("|") message = { "host" => hostname, From 50f6a8d0b154ef04e717673c5238327964e5fc98 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:56:38 +1000 Subject: [PATCH 10/19] Remove unnecessary semicolons --- misc/gnome-icon.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/gnome-icon.rb b/misc/gnome-icon.rb index 3bde4d91e1f9..c6130c505003 100755 --- a/misc/gnome-icon.rb +++ b/misc/gnome-icon.rb @@ -16,7 +16,7 @@ def self.notify message class Graylog2Icon def initialize @icon = Gtk::StatusIcon.new - @icon.pixbuf = Gdk::Pixbuf.new(TRAYICON, 20, 20); + @icon.pixbuf = Gdk::Pixbuf.new(TRAYICON, 20, 20) @icon.tooltip = "Graylog" end From 0c5c40bdd08c518b3cd9fba6129353da7a199c49 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:57:38 +1000 Subject: [PATCH 11/19] Correct the type of map against which comparison is made --- src/test/java/org/graylog2/MessageCounterTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/graylog2/MessageCounterTest.java b/src/test/java/org/graylog2/MessageCounterTest.java index 5ed08b4ebd8a..abca18dbc01e 100644 --- a/src/test/java/org/graylog2/MessageCounterTest.java +++ b/src/test/java/org/graylog2/MessageCounterTest.java @@ -94,7 +94,7 @@ public void testResetHostCounts() { public void testResetStreamCounts() { counter.countUpStream(new ObjectId(), 100); counter.resetStreamCounts(); - assertEquals(new HashMap(), counter.getStreamCounts()); } + assertEquals(new HashMap(), counter.getStreamCounts()); } @Test public void testResetTotal() { From 1f4e20adad179e258c08496972febeb916b6a7cc Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:58:18 +1000 Subject: [PATCH 12/19] Remove redundent semicolon --- misc/convert_rsyslog_db_to_mongo.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/convert_rsyslog_db_to_mongo.rb b/misc/convert_rsyslog_db_to_mongo.rb index a3ef82ae3baf..de7e88bee3a9 100755 --- a/misc/convert_rsyslog_db_to_mongo.rb +++ b/misc/convert_rsyslog_db_to_mongo.rb @@ -8,8 +8,8 @@ begin dbh = Mysql.real_connect("localhost", "root", "mama", "Syslog") - res = dbh.query("SELECT Message, ReceivedAt, FromHost, Facility, Priority FROM SystemEvents ORDER BY ReceivedAt ASC"); - + res = dbh.query("SELECT Message, ReceivedAt, FromHost, Facility, Priority FROM SystemEvents ORDER BY ReceivedAt ASC") + db = Mongo::Connection.new.db("graylog2") coll = db.collection("messages") From 434dc28c7774b342441e15510580a6ba792fe688 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 06:59:22 +1000 Subject: [PATCH 13/19] Remove unnecessary catch and then rethrow --- src/main/java/org/graylog2/database/MongoConnection.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/graylog2/database/MongoConnection.java b/src/main/java/org/graylog2/database/MongoConnection.java index 599f6a5f1e35..a6a158373c6c 100644 --- a/src/main/java/org/graylog2/database/MongoConnection.java +++ b/src/main/java/org/graylog2/database/MongoConnection.java @@ -89,8 +89,6 @@ public synchronized Mongo connect() { throw new RuntimeException("Could not authenticate to database '" + database + "' with user '" + username + "'."); } } - } catch (MongoException.Network e) { - throw e; } catch (UnknownHostException e) { throw new RuntimeException("Cannot resolve host name for MongoDB", e); } From 0526212481fec9afda9fb6471d7ffb9e378a762a Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 07:00:54 +1000 Subject: [PATCH 14/19] Remove unused field --- src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java b/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java index 032f0c45720e..610d4fb586d2 100644 --- a/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java +++ b/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java @@ -39,14 +39,12 @@ public class GELFChunkManager extends Thread { private Map> chunks = Maps.newConcurrentMap(); private GELFProcessor processor; - private GraylogServer server; - // The number of seconds a chunk is valid. Every message with chunks older than this will be dropped. + // The number of seconds a chunk is valid. Every message with chunks older than this will be dropped. public static final int SECONDS_VALID = 5; public GELFChunkManager(GraylogServer server) { this.processor = new GELFProcessor(server); - this.server = server; } @Override From 7640eccc6e58ed88b4f18dc439a1d557b7e28f4b Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 07:01:29 +1000 Subject: [PATCH 15/19] Simplify conditional --- .../java/org/graylog2/inputs/gelf/GELFChunkManager.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java b/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java index 610d4fb586d2..62dc869049f0 100644 --- a/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java +++ b/src/main/java/org/graylog2/inputs/gelf/GELFChunkManager.java @@ -99,12 +99,7 @@ public boolean isComplete(String messageId) { } int claimedSequenceCount = chunks.get(messageId).get(0).getSequenceCount(); - if (claimedSequenceCount == chunks.get(messageId).size()) { - // Message seems to be complete. - return true; - } - - return false; + return claimedSequenceCount == chunks.get( messageId ).size(); } public boolean isOutdated(String messageId) { From 48877e8a0b92371a85a47f9788d2bf9f22611c36 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 07:02:04 +1000 Subject: [PATCH 16/19] Remove unused field --- .../java/org/graylog2/inputs/syslog/SyslogProcessorTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/org/graylog2/inputs/syslog/SyslogProcessorTest.java b/src/test/java/org/graylog2/inputs/syslog/SyslogProcessorTest.java index 6dc3fba7fb74..4f8894199cbf 100644 --- a/src/test/java/org/graylog2/inputs/syslog/SyslogProcessorTest.java +++ b/src/test/java/org/graylog2/inputs/syslog/SyslogProcessorTest.java @@ -20,7 +20,6 @@ package org.graylog2.inputs.syslog; -import org.graylog2.Tools; import org.graylog2.logmessage.LogMessage; import java.net.InetAddress; import org.graylog2.Configuration; @@ -33,7 +32,6 @@ public class SyslogProcessorTest { // http://tools.ietf.org/rfc/rfc5424.txt public static String ValidStructuredMessage = "<165>1 2012-12-25T22:14:15.003Z mymachine.example.com evntslog - ID47 [exampleSDID@32473 iut=\"3\" eventSource=\"Application\" eventID=\"1011\"] BOMAn application event log entry"; public static String ValidNonStructuredMessage = "<86>Dec 24 17:05:01 foo-bar CRON[10049]: pam_unix(cron:session): session closed for user root"; - public static String MessageLookingLikeStructured = "<133>NOMA101FW01A: NetScreen device_id=NOMA101FW01A [Root]system-notification-00257(traffic): start_time=\"2011-12-23 17:33:43\" duration=0 reason=Creation"; @Test public void testMessageReceivedWithNonStructuredMessage() throws Exception { From 69de550da417825341a1aef9454ec51e283029d5 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Thu, 12 Jul 2012 07:02:31 +1000 Subject: [PATCH 17/19] Remove unused field --- src/main/java/org/graylog2/Tools.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/java/org/graylog2/Tools.java b/src/main/java/org/graylog2/Tools.java index adfa37d6394b..9e84ed50d031 100644 --- a/src/main/java/org/graylog2/Tools.java +++ b/src/main/java/org/graylog2/Tools.java @@ -20,15 +20,11 @@ package org.graylog2; -import org.apache.log4j.Logger; - import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.management.ManagementFactory; import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.SocketAddress; import java.net.UnknownHostException; import java.util.Calendar; import java.util.UUID; @@ -43,8 +39,6 @@ */ public final class Tools { - private static final Logger LOG = Logger.getLogger(Tools.class); - private Tools() { } /** From b252c7d1af99ae8068a6641224a0b5bba74f2951 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Fri, 13 Jul 2012 05:50:31 +1000 Subject: [PATCH 18/19] Convert field to local --- .../org/graylog2/periodical/MessageRetentionThread.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/graylog2/periodical/MessageRetentionThread.java b/src/main/java/org/graylog2/periodical/MessageRetentionThread.java index 4d35679e0c45..b8fafb1fb0a4 100644 --- a/src/main/java/org/graylog2/periodical/MessageRetentionThread.java +++ b/src/main/java/org/graylog2/periodical/MessageRetentionThread.java @@ -36,8 +36,6 @@ public class MessageRetentionThread implements Runnable { private static final Logger LOG = Logger.getLogger(MessageRetentionThread.class); - private int retentionTimeDays; - private final GraylogServer server; private final MessageRetention messageRetention; @@ -57,11 +55,11 @@ public void run() { * to be sure to always have the *current* setting from database - even when * used with scheduler. */ - this.retentionTimeDays = settings.getRetentionTimeInDays(); + final int retentionTimeDays = settings.getRetentionTimeInDays(); - LOG.info("Initialized message retention thread - cleaning all messages older than <" + this.retentionTimeDays + " days>."); + LOG.info("Initialized message retention thread - cleaning all messages older than <" + retentionTimeDays + " days>."); - if (messageRetention.performCleanup(this.retentionTimeDays)) { + if (messageRetention.performCleanup( retentionTimeDays )) { messageRetention.updateLastPerformedTime(); } } catch (Exception e) { From c1e8ae1dbb63163b22415eac5552ffeb0496d919 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Fri, 13 Jul 2012 05:51:53 +1000 Subject: [PATCH 19/19] Stop passing unused parameter into ServerValueWriterInitializer --- src/main/java/org/graylog2/Main.java | 2 +- .../graylog2/initializers/ServerValueWriterInitializer.java | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/graylog2/Main.java b/src/main/java/org/graylog2/Main.java index 294bb60371fd..a472a9b61956 100644 --- a/src/main/java/org/graylog2/Main.java +++ b/src/main/java/org/graylog2/Main.java @@ -117,7 +117,7 @@ public static void main(String[] args) { server.initialize(configuration); // Register initializers. - server.registerInitializer(new ServerValueWriterInitializer(server, configuration)); + server.registerInitializer(new ServerValueWriterInitializer(server)); server.registerInitializer(new DroolsInitializer(server, configuration)); server.registerInitializer(new HostCounterCacheWriterInitializer(server)); server.registerInitializer(new MessageCounterInitializer(server)); diff --git a/src/main/java/org/graylog2/initializers/ServerValueWriterInitializer.java b/src/main/java/org/graylog2/initializers/ServerValueWriterInitializer.java index 158ba0dcd14f..37e4b82d403f 100644 --- a/src/main/java/org/graylog2/initializers/ServerValueWriterInitializer.java +++ b/src/main/java/org/graylog2/initializers/ServerValueWriterInitializer.java @@ -20,7 +20,6 @@ package org.graylog2.initializers; -import org.graylog2.Configuration; import org.graylog2.GraylogServer; import org.graylog2.HostSystem; import org.graylog2.ServerValue; @@ -32,11 +31,8 @@ */ public class ServerValueWriterInitializer extends SimpleFixedRateScheduleInitializer implements Initializer { - private Configuration configuration; - - public ServerValueWriterInitializer(GraylogServer graylogServer, Configuration configuration) { + public ServerValueWriterInitializer(GraylogServer graylogServer) { this.graylogServer = graylogServer; - this.configuration = configuration; } @Override