apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7177: Fixed AlertSyslogAppender does not honor a non-default port in sysloghost parameter

Browse Source
This commit is contained in:
Anshul Gangwar 2014-07-24 10:58:05 +05:30 committed by Devdeep Singh
parent aadb5f4ad5
commit 97f5281cf4
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java
View File

@ -157,13 +157,25 @@ public class AlertsSyslogAppender extends AppenderSkeleton {
private boolean validateIpAddresses() { private boolean validateIpAddresses() {
for (String ipAddress : _syslogHostsList) { for (String ipAddress : _syslogHostsList) {
if (ipAddress.trim().equalsIgnoreCase("localhost")) { String[] hostTokens = (ipAddress.trim()).split(":");
continue; String ip = hostTokens[0];
}
if (!NetUtils.isValidIp(ipAddress)) { if (hostTokens.length >= 1 && hostTokens.length <= 2) {
if (hostTokens.length == 2 && !NetUtils.isValidPort(hostTokens[1])) {
return false;
}
if (ip.equalsIgnoreCase("localhost")) {
continue;
}
if (!NetUtils.isValidIp(ip)) {
return false;
}
} else
{
return false; return false;
} }
} }
return true; return true;
} }
@ -265,7 +277,7 @@ public class AlertsSyslogAppender extends AppenderSkeleton {
return; return;
} }
this._facility = facility; _facility = facility;
if (_syslogAppenders != null && !_syslogAppenders.isEmpty()) { if (_syslogAppenders != null && !_syslogAppenders.isEmpty()) {
for (SyslogAppender syslogAppender : _syslogAppenders) { for (SyslogAppender syslogAppender : _syslogAppenders) {
syslogAppender.setFacility(facility); syslogAppender.setFacility(facility);
@ -299,8 +311,8 @@ public class AlertsSyslogAppender extends AppenderSkeleton {
} }
public void setSyslogHosts(String syslogHosts) { public void setSyslogHosts(String syslogHosts) {
this._syslogHosts = syslogHosts; _syslogHosts = syslogHosts;
this.setSyslogAppenders(); setSyslogAppenders();
} }
public String getDelimiter() { public String getDelimiter() {
@ -308,7 +320,7 @@ public class AlertsSyslogAppender extends AppenderSkeleton {
} }
public void setDelimiter(String delimiter) { public void setDelimiter(String delimiter) {
this._delimiter = delimiter; _delimiter = delimiter;
} }
public String getPairDelimiter() { public String getPairDelimiter() {
@ -316,7 +328,7 @@ public class AlertsSyslogAppender extends AppenderSkeleton {
} }
public void setPairDelimiter(String pairDelimiter) { public void setPairDelimiter(String pairDelimiter) {
this._pairDelimiter = pairDelimiter; _pairDelimiter = pairDelimiter;
} }
public String getKeyValueDelimiter() { public String getKeyValueDelimiter() {
@ -324,6 +336,6 @@ public class AlertsSyslogAppender extends AppenderSkeleton {
} }
public void setKeyValueDelimiter(String keyValueDelimiter) { public void setKeyValueDelimiter(String keyValueDelimiter) {
this._keyValueDelimiter = keyValueDelimiter; _keyValueDelimiter = keyValueDelimiter;
} }
} }