Febbweiss/logstash-forwarder-java
1
0
Fork 0
mirror of https://github.com/Febbweiss/logstash-forwarder-java.git synced 2026-03-04 22:25:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Logging improvements (issue #9).

Browse Source
This commit is contained in:
didfet
2015-06-08 16:53:34 +02:00
parent a5f884c44f
commit 29c413d7cb
2 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/info/fetter/logstashforwarder/FileWatcher.java
View File

@@ -337,7 +337,7 @@ public class FileWatcher {
if(markedList != null) { if(markedList != null) {
for(File file : markedList) { for(File file : markedList) {
oldWatchMap.remove(file); oldWatchMap.remove(file);
logger.debug("File: " + file + " removed from watchMap"); logger.debug("File " + file + " removed from watchMap");
} }
} }
} }

63
src/main/java/info/fetter/logstashforwarder/Forwarder.java
View File

@@ -43,6 +43,7 @@ import org.apache.log4j.Layout;
import org.apache.log4j.Level; import org.apache.log4j.Level;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.log4j.PatternLayout; import org.apache.log4j.PatternLayout;
import org.apache.log4j.RollingFileAppender;
import org.apache.log4j.spi.RootLogger; import org.apache.log4j.spi.RootLogger;
public class Forwarder { public class Forwarder {
@@ -61,6 +62,9 @@ public class Forwarder {
private static Random random = new Random(); private static Random random = new Random();
private static int signatureLength = 4096; private static int signatureLength = 4096;
private static boolean tailSelected = false; private static boolean tailSelected = false;
private static String logfile = null;
private static String logfileSize = "10M";
private static int logfileNumber = 5;
public static void main(String[] args) { public static void main(String[] args) {
try { try {
@@ -133,11 +137,11 @@ public class Forwarder {
static void parseOptions(String[] args) { static void parseOptions(String[] args) {
Options options = new Options(); Options options = new Options();
Option helpOption = new Option("help", "print this message"); Option helpOption = new Option("help", "print this message");
Option quiet = new Option("quiet", "operate in quiet mode - only emit errors to log"); Option quietOption = new Option("quiet", "operate in quiet mode - only emit errors to log");
Option debug = new Option("debug", "operate in debug mode"); Option debugOption = new Option("debug", "operate in debug mode");
Option debugWatcher = new Option("debugwatcher", "operate watcher in debug mode"); Option debugWatcherOption = new Option("debugwatcher", "operate watcher in debug mode");
Option trace = new Option("trace", "operate in trace mode"); Option traceOption = new Option("trace", "operate in trace mode");
Option tail = new Option("tail", "read new files from the end"); Option tailOption = new Option("tail", "read new files from the end");
Option spoolSizeOption = OptionBuilder.withArgName("number of events") Option spoolSizeOption = OptionBuilder.withArgName("number of events")
.hasArg() .hasArg()
@@ -156,17 +160,33 @@ public class Forwarder {
.hasArg() .hasArg()
.withDescription("Maximum length of file signature") .withDescription("Maximum length of file signature")
.create("signaturelength"); .create("signaturelength");
Option logfileOption = OptionBuilder.withArgName("logfile name")
.hasArg()
.withDescription("Logfile name")
.create("logfile");
Option logfileSizeOption = OptionBuilder.withArgName("logfile size")
.hasArg()
.withDescription("Logfile size (default 10M)")
.create("logfilesize");
Option logfileNumberOption = OptionBuilder.withArgName("number of logfiles")
.hasArg()
.withDescription("Number of logfiles (default 5)")
.create("logfilenumber");
options.addOption(helpOption) options.addOption(helpOption)
.addOption(idleTimeoutOption) .addOption(idleTimeoutOption)
.addOption(spoolSizeOption) .addOption(spoolSizeOption)
.addOption(quiet) .addOption(quietOption)
.addOption(debug) .addOption(debugOption)
.addOption(debugWatcher) .addOption(debugWatcherOption)
.addOption(trace) .addOption(traceOption)
.addOption(tail) .addOption(tailOption)
.addOption(signatureLengthOption) .addOption(signatureLengthOption)
.addOption(configOption); .addOption(configOption)
.addOption(logfileOption)
.addOption(logfileNumberOption)
.addOption(logfileSizeOption);
CommandLineParser parser = new GnuParser(); CommandLineParser parser = new GnuParser();
try { try {
CommandLine line = parser.parse(options, args); CommandLine line = parser.parse(options, args);
@@ -197,6 +217,15 @@ public class Forwarder {
if(line.hasOption("tail")) { if(line.hasOption("tail")) {
tailSelected = true; tailSelected = true;
} }
if(line.hasOption("logfile")) {
logfile = line.getOptionValue("logfile");
}
if(line.hasOption("logfilesize")) {
logfileSize = line.getOptionValue("logfilesize");
}
if(line.hasOption("logfilenumber")) {
logfileNumber = Integer.parseInt(line.getOptionValue("logfilenumber"));
}
} catch(ParseException e) { } catch(ParseException e) {
printHelp(options); printHelp(options);
System.exit(1);; System.exit(1);;
@@ -212,9 +241,17 @@ public class Forwarder {
formatter.printHelp("logstash-forwarder", options); formatter.printHelp("logstash-forwarder", options);
} }
private static void setupLogging() { private static void setupLogging() throws IOException {
Appender appender;
Layout layout = new PatternLayout("%d %p %c{1} - %m%n"); Layout layout = new PatternLayout("%d %p %c{1} - %m%n");
Appender appender = new ConsoleAppender(layout); if(logfile == null) {
appender = new ConsoleAppender(layout);
} else {
RollingFileAppender rolling = new RollingFileAppender(layout, logfile, true);
rolling.setMaxFileSize(logfileSize);
rolling.setMaxBackupIndex(logfileNumber);
appender = rolling;
}
BasicConfigurator.configure(appender); BasicConfigurator.configure(appender);
RootLogger.getRootLogger().setLevel(logLevel); RootLogger.getRootLogger().setLevel(logLevel);
if(debugWatcherSelected) { if(debugWatcherSelected) {