From: Lorand Jakab Date: Tue, 14 Jul 2015 12:07:19 +0000 (+0300) Subject: Improve exception code X-Git-Tag: release/beryllium~138 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a91cc2eccbb98cfb12d1ad02518fd89f1cd8b212;hp=c7ca90c3a6d818a059ab770a7683cd89d6bf5150;p=lispflowmapping.git Improve exception code Change-Id: If86fe497c1b8f89a50a919088638a14ce8117c5c Signed-off-by: Lorand Jakab --- diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java index 408b3b03f..07eb4f929 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapResolver.java @@ -13,6 +13,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map.Entry; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.opendaylight.lispflowmapping.implementation.config.ConfigIni; import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceKeyUtil; import org.opendaylight.lispflowmapping.implementation.util.DAOMappingUtil; @@ -182,7 +183,7 @@ public class MapResolver extends AbstractLispComponent implements IMapResolverAs } } } catch (ClassCastException cce) { - LOG.error("Class Cast Exception while building EidToLocatorRecord: {}", cce); + LOG.error("Class Cast Exception while building EidToLocatorRecord: {}", ExceptionUtils.getStackTrace(cce)); } } diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java index f378412d7..bb6d8dca6 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/lisp/MapServer.java @@ -8,8 +8,6 @@ package org.opendaylight.lispflowmapping.implementation.lisp; -import java.io.PrintWriter; -import java.io.StringWriter; import java.net.InetAddress; import java.net.NetworkInterface; import java.net.SocketException; @@ -23,6 +21,7 @@ import java.util.Random; import java.util.Map.Entry; import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.opendaylight.lispflowmapping.implementation.authentication.LispAuthenticationUtil; import org.opendaylight.lispflowmapping.implementation.config.ConfigIni; import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceKeyUtil; @@ -334,9 +333,7 @@ public class MapServer extends AbstractLispComponent implements IMapServerAsync try { callback.handleSMR(mapRequest, rloc.getSrcRloc()); } catch (Exception e) { - StringWriter sw = new StringWriter(); - e.printStackTrace(new PrintWriter(sw)); - LOG.error("Errors encountered while handling SMR:" + sw.toString()); + LOG.error("Errors encountered while handling SMR:" + ExceptionUtils.getStackTrace(e)); } } } diff --git a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MaskUtil.java b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MaskUtil.java index 9f05aceb7..ce3139230 100644 --- a/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MaskUtil.java +++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/MaskUtil.java @@ -13,6 +13,7 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.LispAFIAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lcafsegmentaddress.AddressBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.control.plane.rev150314.lcafsegmentaddress.Address; @@ -49,7 +50,7 @@ public class MaskUtil { return new LcafSegmentAddrBuilder(segAddr).setAddress(normalizedAddr).build(); } } catch (UnknownHostException e) { - LOG.trace("Failed to normalize " + address + ": " + e.getMessage()); + LOG.trace("Failed to normalize " + address + ": " + ExceptionUtils.getStackTrace(e)); return null; } return null; diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java index 8973bfee5..6df87d191 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java @@ -12,6 +12,7 @@ import java.net.HttpURLConnection; import java.util.List; import java.util.concurrent.Future; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.opendaylight.lispflowmapping.implementation.util.LispAFIConvertor; import org.opendaylight.neutron.spi.INeutronPortAware; import org.opendaylight.neutron.spi.NeutronPort; @@ -89,7 +90,8 @@ public class LispNeutronPortHandler extends LispNeutronService implements } catch (Exception e) { - LOG.warn("Failed to GET mapping for EID {}: , mappingInput: {} , Exception: {}", hostAddress, input, e); + LOG.warn("Failed to GET mapping for EID {}: , mappingInput: {} , Exception: {}", hostAddress, input, + ExceptionUtils.getStackTrace(e)); return; } diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java index ee45782bc..5d55ef581 100644 --- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java +++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java @@ -10,6 +10,7 @@ package org.opendaylight.lispflowmapping.neutron; import java.net.HttpURLConnection; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.net.util.SubnetUtils; import org.apache.commons.net.util.SubnetUtils.SubnetInfo; import org.opendaylight.lispflowmapping.implementation.util.LispAFIConvertor; @@ -80,7 +81,7 @@ public class LispNeutronSubnetHandler extends LispNeutronService implements + subnet.getNetworkUUID()); } catch (Exception e) { LOG.error("Adding new subnet to lisp service mapping service failed. Subnet : " - + subnet.toString() + "Error: "+ e); + + subnet.toString() + "Error: " + ExceptionUtils.getStackTrace(e)); } LOG.info("Neutron Subnet Created request : Subnet name: " + subnet.getName() + " Subnet Cidr: " + subnet.getCidr()); @@ -166,7 +167,7 @@ public class LispNeutronSubnetHandler extends LispNeutronService implements + subnet.getNetworkUUID()); } catch (Exception e) { LOG.error("Deleting subnet's EID prefix from mapping service failed + Subnet: " - + subnet.toString()); + + subnet.toString() + "Error: " + ExceptionUtils.getStackTrace(e)); } } diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java index dcaf09153..0cbee80ba 100644 --- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java +++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java @@ -17,6 +17,7 @@ import java.net.SocketException; import java.net.SocketTimeoutException; import java.nio.ByteBuffer; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; @@ -195,7 +196,7 @@ public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCl restartXtrThread(); } } catch (SocketException e) { - LOG.error("couldn't start socket {}", e.getMessage()); + LOG.error("couldn't start socket: {}", ExceptionUtils.getStackTrace(e)); } } @@ -207,7 +208,7 @@ public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCl xtrThread.start(); LOG.info("xTR Southbound Plugin is up!"); } catch (SocketException e) { - LOG.warn("failed to start xtr thread: {}", e.getMessage()); + LOG.warn("failed to start xtr thread: {}", ExceptionUtils.getStackTrace(e)); } }