got rid of dos eol which seems to confuse jdk in generating line numbers

This commit is contained in:
Alex Huang 2011-07-09 13:35:06 -07:00
parent e5994a6485
commit 26b3c26974

View File

@ -16,148 +16,145 @@
*
*/
package com.cloud.alert;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import com.cloud.cluster.ClusterManager;
import com.cloud.cluster.ClusterNodeJoinEventArgs;
import com.cloud.cluster.ClusterNodeLeftEventArgs;
import com.cloud.cluster.ManagementServerHostVO;
import com.cloud.cluster.dao.ManagementServerHostDao;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.events.EventArgs;
import com.cloud.utils.events.SubscriptionMgr;
@Local(value=AlertAdapter.class)
public class ClusterAlertAdapter implements AlertAdapter {
private static final Logger s_logger = Logger.getLogger(ClusterAlertAdapter.class);
private AlertManager _alertMgr;
private String _name;
private ManagementServerHostDao _mshostDao;
public void onClusterAlert(Object sender, EventArgs args) {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Receive cluster alert, EventArgs: " + args.getClass().getName());
}
if(args instanceof ClusterNodeJoinEventArgs) {
onClusterNodeJoined(sender, (ClusterNodeJoinEventArgs)args);
} else if(args instanceof ClusterNodeLeftEventArgs) {
onClusterNodeLeft(sender, (ClusterNodeLeftEventArgs)args);
} else {
s_logger.error("Unrecognized cluster alert event");
}
}
private void onClusterNodeJoined(Object sender, ClusterNodeJoinEventArgs args) {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Handle cluster node join alert, self node: " + args.getSelf());
}
for(ManagementServerHostVO mshost : args.getJoinedNodes()) {
if(mshost.getId() == args.getSelf().longValue()) {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Management server node " + mshost.getServiceIP() + " is up, send alert");
}
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0),
"Management server node " + mshost.getServiceIP() + " is up", "");
break;
}
}
}
private void onClusterNodeLeft(Object sender, ClusterNodeLeftEventArgs args) {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Handle cluster node left alert, self node: " + args.getSelf());
}
for(ManagementServerHostVO mshost : args.getLeftNodes()) {
if(mshost.getId() != args.getSelf().longValue()) {
GlobalLock lock = GlobalLock.getInternLock("ManagementAlert." + mshost.getId());
try {
if(lock.lock(180)) {
try {
ManagementServerHostVO alertHost = _mshostDao.findById(mshost.getId());
if(alertHost.getAlertCount() == 0) {
_mshostDao.increaseAlertCount(mshost.getId());
if(s_logger.isDebugEnabled()) {
s_logger.debug("Detected management server node " + mshost.getServiceIP() + " is down, send alert");
}
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0),
"Management server node " + mshost.getServiceIP() + " is down", "");
} else {
if(s_logger.isDebugEnabled()) {
s_logger.debug("Detected management server node " + mshost.getServiceIP() + " is down, but alert has already been set");
}
}
} finally {
lock.unlock();
}
}
} finally {
lock.releaseRef();
}
}
}
}
@Override
public boolean configure(String name, Map<String, Object> params)
throws ConfigurationException {
if (s_logger.isInfoEnabled()) {
s_logger.info("Start configuring cluster alert manager : " + name);
}
ComponentLocator locator = ComponentLocator.getCurrentLocator();
_mshostDao = locator.getDao(ManagementServerHostDao.class);
if(_mshostDao == null) {
throw new ConfigurationException("Unable to get " + ManagementServerHostDao.class.getName());
}
_alertMgr = locator.getManager(AlertManager.class);
if (_alertMgr == null) {
throw new ConfigurationException("Unable to get " + AlertManager.class.getName());
}
try {
SubscriptionMgr.getInstance().subscribe(ClusterManager.ALERT_SUBJECT, this, "onClusterAlert");
} catch (SecurityException e) {
throw new ConfigurationException("Unable to register cluster event subscription");
} catch (NoSuchMethodException e) {
throw new ConfigurationException("Unable to register cluster event subscription");
}
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}
package com.cloud.alert;
import java.util.Map;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import com.cloud.cluster.ClusterManager;
import com.cloud.cluster.ClusterNodeJoinEventArgs;
import com.cloud.cluster.ClusterNodeLeftEventArgs;
import com.cloud.cluster.ManagementServerHostVO;
import com.cloud.cluster.dao.ManagementServerHostDao;
import com.cloud.utils.component.ComponentLocator;
import com.cloud.utils.db.GlobalLock;
import com.cloud.utils.events.EventArgs;
import com.cloud.utils.events.SubscriptionMgr;
@Local(value = AlertAdapter.class)
public class ClusterAlertAdapter implements AlertAdapter {
private static final Logger s_logger = Logger.getLogger(ClusterAlertAdapter.class);
private AlertManager _alertMgr;
private String _name;
private ManagementServerHostDao _mshostDao;
public void onClusterAlert(Object sender, EventArgs args) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Receive cluster alert, EventArgs: " + args.getClass().getName());
}
if (args instanceof ClusterNodeJoinEventArgs) {
onClusterNodeJoined(sender, (ClusterNodeJoinEventArgs)args);
} else if (args instanceof ClusterNodeLeftEventArgs) {
onClusterNodeLeft(sender, (ClusterNodeLeftEventArgs)args);
} else {
s_logger.error("Unrecognized cluster alert event");
}
}
private void onClusterNodeJoined(Object sender, ClusterNodeJoinEventArgs args) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Handle cluster node join alert, self node: " + args.getSelf());
}
for (ManagementServerHostVO mshost : args.getJoinedNodes()) {
if (mshost.getId() == args.getSelf().longValue()) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Management server node " + mshost.getServiceIP() + " is up, send alert");
}
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management server node " + mshost.getServiceIP() + " is up", "");
break;
}
}
}
private void onClusterNodeLeft(Object sender, ClusterNodeLeftEventArgs args) {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Handle cluster node left alert, self node: " + args.getSelf());
}
for (ManagementServerHostVO mshost : args.getLeftNodes()) {
if (mshost.getId() != args.getSelf().longValue()) {
GlobalLock lock = GlobalLock.getInternLock("ManagementAlert." + mshost.getId());
try {
if (lock.lock(180)) {
try {
ManagementServerHostVO alertHost = _mshostDao.findById(mshost.getId());
if (alertHost.getAlertCount() == 0) {
_mshostDao.increaseAlertCount(mshost.getId());
if (s_logger.isDebugEnabled()) {
s_logger.debug("Detected management server node " + mshost.getServiceIP() + " is down, send alert");
}
_alertMgr.sendAlert(AlertManager.ALERT_TYPE_MANAGMENT_NODE, 0, new Long(0), "Management server node " + mshost.getServiceIP() + " is down", "");
} else {
if (s_logger.isDebugEnabled()) {
s_logger.debug("Detected management server node " + mshost.getServiceIP() + " is down, but alert has already been set");
}
}
} finally {
lock.unlock();
}
}
} finally {
lock.releaseRef();
}
}
}
}
@Override
public boolean configure(String name, Map<String, Object> params) throws ConfigurationException {
if (s_logger.isInfoEnabled()) {
s_logger.info("Start configuring cluster alert manager : " + name);
}
ComponentLocator locator = ComponentLocator.getCurrentLocator();
_mshostDao = locator.getDao(ManagementServerHostDao.class);
if (_mshostDao == null) {
throw new ConfigurationException("Unable to get " + ManagementServerHostDao.class.getName());
}
_alertMgr = locator.getManager(AlertManager.class);
if (_alertMgr == null) {
throw new ConfigurationException("Unable to get " + AlertManager.class.getName());
}
try {
SubscriptionMgr.getInstance().subscribe(ClusterManager.ALERT_SUBJECT, this, "onClusterAlert");
} catch (SecurityException e) {
throw new ConfigurationException("Unable to register cluster event subscription");
} catch (NoSuchMethodException e) {
throw new ConfigurationException("Unable to register cluster event subscription");
}
return true;
}
@Override
public String getName() {
return _name;
}
@Override
public boolean start() {
return true;
}
@Override
public boolean stop() {
return true;
}
}