From 0a0e94811cdaa08768d9abe3e4c580e0144807cf Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 8 Sep 2010 16:22:17 -0700 Subject: [PATCH] clean up logs --- .../xen/resource/CitrixResourceBase.java | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index df17e53e672..7dc8cad81a7 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -3376,23 +3376,14 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR } catch (XenAPIException e) { continue; } - long tag = pif.getVLAN(conn); - VLAN vlan = pif.getVLANMasterOf(conn); - String uuid = vlan.getUuid(conn); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Destroying VLAN, tag: " + tag + " uuid:" + uuid + " on host " + _host.ip); - } - vlan.destroy(conn); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Destroyed VLAN, tag: " + tag + " uuid:" + uuid + " on host " + _host.ip); - } + } } } catch (XenAPIException e) { - String msg = "Unable to disable VLAN network due to " + e.toString(); + String msg = e.getClass() + " Unable to disable VLAN network due to " + e.toString(); s_logger.warn(msg, e); - } catch (Exception e) { - String msg = "Unable to disable VLAN network due to " + e.getMessage(); + } catch (XmlRpcException e) { + String msg = e.getClass() + " Unable to disable VLAN network due to " + e.getMessage(); s_logger.warn(msg, e); } }