Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added configuration option syslog_listen_address #70

Merged
merged 1 commit into from
Jan 31, 2012
Merged

Added configuration option syslog_listen_address #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/org/graylog2/Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ public class Configuration {
@Parameter(value = "syslog_protocol", required = true)
private String syslogProtocol = "udp";

@Parameter(value = "syslog_listen_address")
private String syslogListenAddress = "0.0.0.0";

@Parameter(value = "force_syslog_rdns", required = true)
private boolean forceSyslogRdns = false;

Expand Down Expand Up @@ -147,6 +150,10 @@ public int getSyslogListenPort() {
return syslogListenPort;
}

public String getSyslogListenAddress() {
return syslogListenAddress;
}

public String getSyslogProtocol() {
return syslogProtocol;
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/graylog2/Main.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ public static void main(String[] args) {

initializeMongoConnection(configuration);
initializeRulesEngine(configuration.getDroolsRulesFile());
initializeSyslogServer(configuration.getSyslogProtocol(), configuration.getSyslogListenPort());
initializeSyslogServer(configuration.getSyslogProtocol(), configuration.getSyslogListenPort(), configuration.getSyslogListenAddress());
initializeHostCounterCache(scheduler);

// Start message counter thread.
Expand Down Expand Up @@ -240,10 +240,10 @@ private static void initializeGELFThreads(String gelfAddress, int gelfPort, Sche
LOG.info("GELF threads started");
}

private static void initializeSyslogServer(String syslogProtocol, int syslogPort) {
private static void initializeSyslogServer(String syslogProtocol, int syslogPort, String syslogHost) {

// Start the Syslog thread that accepts syslog packages.
SyslogServerThread syslogServerThread = new SyslogServerThread(syslogProtocol, syslogPort);
SyslogServerThread syslogServerThread = new SyslogServerThread(syslogProtocol, syslogPort, syslogHost);
syslogServerThread.start();

// Check if the thread started up completely.
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/graylog2/messagehandlers/syslog/SyslogServerThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
public class SyslogServerThread extends Thread {

private int port;
private String host;
private String syslogProtocol;

private Thread coreThread = null;
Expand All @@ -44,9 +45,10 @@ public class SyslogServerThread extends Thread {
* @param syslogProtocol Protocol to use for the Syslog server (tcp/udp)
* @param port On which port to listen?
*/
public SyslogServerThread(String syslogProtocol, int port) {
public SyslogServerThread(String syslogProtocol, int port, String host) {
this.syslogProtocol = syslogProtocol;
this.port = port;
this.host = host;
}

/**
Expand All @@ -58,6 +60,7 @@ public SyslogServerThread(String syslogProtocol, int port) {
SyslogServerConfigIF syslogServerConfig = syslogServer.getConfig();

syslogServerConfig.setPort(port);
syslogServerConfig.setHost(host);
syslogServerConfig.setUseStructuredData(true);
syslogServerConfig.addEventHandler(new SyslogEventHandler());

Expand Down