Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D3CFC17410 for ; Mon, 31 Aug 2015 06:01:33 +0000 (UTC) Received: (qmail 84314 invoked by uid 500); 31 Aug 2015 06:01:23 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 84246 invoked by uid 500); 31 Aug 2015 06:01:23 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 83099 invoked by uid 99); 31 Aug 2015 06:01:23 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Aug 2015 06:01:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DD772DFDD7; Mon, 31 Aug 2015 06:01:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rajani@apache.org To: commits@cloudstack.apache.org Date: Mon, 31 Aug 2015 06:01:50 -0000 Message-Id: In-Reply-To: <4b5d4aebe7884558918f0bca0a790f64@git.apache.org> References: <4b5d4aebe7884558918f0bca0a790f64@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [30/35] git commit: updated refs/heads/master to 8bc0294 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java index 18f564f..b2cf2d8 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectDaoImpl.java @@ -21,6 +21,7 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.projects.Project; @@ -38,6 +39,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {ProjectDao.class}) public class ProjectDaoImpl extends GenericDaoBase implements ProjectDao { + private static final Logger s_logger = Logger.getLogger(ProjectDaoImpl.class); protected final SearchBuilder AllFieldsSearch; protected GenericSearchBuilder CountByDomain; protected GenericSearchBuilder ProjectAccountSearch; @@ -77,7 +79,7 @@ public class ProjectDaoImpl extends GenericDaoBase implements P ProjectVO projectToRemove = findById(projectId); projectToRemove.setName(null); if (!update(projectId, projectToRemove)) { - logger.warn("Failed to reset name for the project id=" + projectId + " as a part of project remove"); + s_logger.warn("Failed to reset name for the project id=" + projectId + " as a part of project remove"); return false; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java b/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java index 16112c4..0dff4af 100644 --- a/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java +++ b/engine/schema/src/com/cloud/projects/dao/ProjectInvitationDaoImpl.java @@ -21,6 +21,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.projects.ProjectInvitation.State; @@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria; @Component @Local(value = {ProjectInvitationDao.class}) public class ProjectInvitationDaoImpl extends GenericDaoBase implements ProjectInvitationDao { + private static final Logger s_logger = Logger.getLogger(ProjectInvitationDaoImpl.class); protected final SearchBuilder AllFieldsSearch; protected final SearchBuilder InactiveSearch; @@ -89,7 +91,7 @@ public class ProjectInvitationDaoImpl extends GenericDaoBase implements SnapshotDao { + public static final Logger s_logger = Logger.getLogger(SnapshotDaoImpl.class.getName()); // TODO: we should remove these direct sqls private static final String GET_LAST_SNAPSHOT = "SELECT snapshots.id FROM snapshot_store_ref, snapshots where snapshots.id = snapshot_store_ref.snapshot_id AND snapshosts.volume_id = ? AND snapshot_store_ref.role = ? ORDER BY created DESC"; @@ -206,7 +208,7 @@ public class SnapshotDaoImpl extends GenericDaoBase implements return rs.getLong(1); } } catch (Exception ex) { - logger.info("[ignored]" + s_logger.info("[ignored]" + "caught something while getting sec. host id: " + ex.getLocalizedMessage()); } return null; @@ -226,7 +228,7 @@ public class SnapshotDaoImpl extends GenericDaoBase implements return rs.getLong(1); } } catch (Exception ex) { - logger.error("error getting last snapshot", ex); + s_logger.error("error getting last snapshot", ex); } return 0; } @@ -244,7 +246,7 @@ public class SnapshotDaoImpl extends GenericDaoBase implements pstmt.executeUpdate(); return 1; } catch (Exception ex) { - logger.error("error getting last snapshot", ex); + s_logger.error("error getting last snapshot", ex); } return 0; } @@ -261,7 +263,7 @@ public class SnapshotDaoImpl extends GenericDaoBase implements pstmt.executeUpdate(); return 1; } catch (Exception ex) { - logger.error("error set secondary storage host id", ex); + s_logger.error("error set secondary storage host id", ex); } return 0; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java index df5a45a..c1a7657 100644 --- a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java @@ -24,6 +24,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.host.Status; @@ -37,6 +38,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {StoragePoolHostDao.class}) public class StoragePoolHostDaoImpl extends GenericDaoBase implements StoragePoolHostDao { + public static final Logger s_logger = Logger.getLogger(StoragePoolHostDaoImpl.class.getName()); protected final SearchBuilder PoolSearch; protected final SearchBuilder HostSearch; @@ -113,10 +115,10 @@ public class StoragePoolHostDaoImpl extends GenericDaoBase(rs.getLong(1), rs.getInt(2))); } } catch (SQLException e) { - logger.debug("SQLException: ", e); + s_logger.debug("SQLException: ", e); } return l; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java index 42f989a..191fc4c 100644 --- a/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/UploadDaoImpl.java @@ -20,6 +20,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.storage.Upload.Mode; @@ -32,6 +33,7 @@ import com.cloud.utils.db.SearchCriteria; @Component @Local(value = {UploadDao.class}) public class UploadDaoImpl extends GenericDaoBase implements UploadDao { + public static final Logger s_logger = Logger.getLogger(UploadDaoImpl.class.getName()); protected final SearchBuilder typeUploadStatusSearch; protected final SearchBuilder typeHostAndUploadStatusSearch; protected final SearchBuilder typeModeAndStatusSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index 0c21c4f..02fb4b4 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -30,6 +30,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.dc.dao.DataCenterDao; @@ -64,6 +65,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Component @Local(value = {VMTemplateDao.class}) public class VMTemplateDaoImpl extends GenericDaoBase implements VMTemplateDao { + private static final Logger s_logger = Logger.getLogger(VMTemplateDaoImpl.class); @Inject VMTemplateZoneDao _templateZoneDao; @@ -232,7 +234,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem l.add(rs.getLong(1)); } } catch (SQLException e) { - logger.debug("Exception: ", e); + s_logger.debug("Exception: ", e); } return l; } @@ -286,7 +288,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem routerTmpltName = (String)params.get("routing.uniquename"); - logger.debug("Found parameter routing unique name " + routerTmpltName); + s_logger.debug("Found parameter routing unique name " + routerTmpltName); if (routerTmpltName == null) { routerTmpltName = "routing"; } @@ -295,8 +297,8 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem if (consoleProxyTmpltName == null) { consoleProxyTmpltName = "routing"; } - if (logger.isDebugEnabled()) { - logger.debug("Use console proxy template : " + consoleProxyTmpltName); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Use console proxy template : " + consoleProxyTmpltName); } UniqueNameSearch = createSearchBuilder(); @@ -510,10 +512,10 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem * (rs.next()) { Pair templateZonePair = new Pair(rs.getLong(1), -1L); templateZonePairList.add(templateZonePair); } * - * } catch (Exception e) { logger.warn("Error listing templates", e); } + * } catch (Exception e) { s_logger.warn("Error listing templates", e); } * finally { try { if (rs != null) { rs.close(); } if (pstmt != null) { * pstmt.close(); } txn.commit(); } catch (SQLException sqle) { - * logger.warn("Error in cleaning up", sqle); } } + * s_logger.warn("Error in cleaning up", sqle); } } * * return templateZonePairList; } * @@ -694,9 +696,9 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem * null)); continue; } else if (keyword == null && name == null){ * templateZonePairList.add(new Pair(publicIsos.get(i).getId(), * null)); } } } } } catch (Exception e) { - * logger.warn("Error listing templates", e); } finally { try { if (rs != + * s_logger.warn("Error listing templates", e); } finally { try { if (rs != * null) { rs.close(); } if (pstmt != null) { pstmt.close(); } txn.commit(); - * } catch( SQLException sqle) { logger.warn("Error in cleaning up", + * } catch( SQLException sqle) { s_logger.warn("Error in cleaning up", * sqle); } } * * return templateZonePairList; } @@ -1019,7 +1021,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem * while (rs.next()) { final Pair templateZonePair = new * Pair( rs.getLong(1), -1L); * templateZonePairList.add(templateZonePair); } txn.commit(); } catch - * (Exception e) { logger.warn("Error listing S3 templates", e); if (txn + * (Exception e) { s_logger.warn("Error listing S3 templates", e); if (txn * != null) { txn.rollback(); } } finally { closeResources(pstmt, rs); if * (txn != null) { txn.close(); } } * @@ -1048,7 +1050,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem builder.set(vo, "updated", new Date()); int rows = update((VMTemplateVO)vo, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { VMTemplateVO dbTemplate = findByIdIncludingRemoved(vo.getId()); if (dbTemplate != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); @@ -1081,7 +1083,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update template: id=" + vo.getId() + ", as no such template exists in the database anymore"); + s_logger.debug("Unable to update template: id=" + vo.getId() + ", as no such template exists in the database anymore"); } } return rows > 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java index 862ca43..a176881 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java @@ -29,6 +29,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; @@ -52,6 +53,7 @@ import com.cloud.utils.db.UpdateBuilder; @Component @Local(value = {VMTemplateHostDao.class}) public class VMTemplateHostDaoImpl extends GenericDaoBase implements VMTemplateHostDao { + public static final Logger s_logger = Logger.getLogger(VMTemplateHostDaoImpl.class.getName()); @Inject HostDao _hostDao; protected final SearchBuilder HostSearch; @@ -170,7 +172,7 @@ public class VMTemplateHostDaoImpl extends GenericDaoBase 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java index 8a4f8f1..aacd4ff 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplatePoolDaoImpl.java @@ -24,6 +24,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; @@ -43,6 +44,7 @@ import com.cloud.utils.db.UpdateBuilder; @Component @Local(value = {VMTemplatePoolDao.class}) public class VMTemplatePoolDaoImpl extends GenericDaoBase implements VMTemplatePoolDao { + public static final Logger s_logger = Logger.getLogger(VMTemplatePoolDaoImpl.class.getName()); protected final SearchBuilder PoolSearch; protected final SearchBuilder TemplateSearch; @@ -158,7 +160,7 @@ public class VMTemplatePoolDaoImpl extends GenericDaoBase 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java index ebd0cf5..8cadf61 100644 --- a/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VMTemplateZoneDaoImpl.java @@ -20,6 +20,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.storage.VMTemplateZoneVO; @@ -31,6 +32,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {VMTemplateZoneDao.class}) public class VMTemplateZoneDaoImpl extends GenericDaoBase implements VMTemplateZoneDao { + public static final Logger s_logger = Logger.getLogger(VMTemplateZoneDaoImpl.class.getName()); protected final SearchBuilder ZoneSearch; protected final SearchBuilder TemplateSearch; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java index e260770..85d08b8 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -26,6 +26,7 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.exception.InvalidParameterValueException; @@ -54,6 +55,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Component @Local(value = VolumeDao.class) public class VolumeDaoImpl extends GenericDaoBase implements VolumeDao { + private static final Logger s_logger = Logger.getLogger(VolumeDaoImpl.class); protected final SearchBuilder DetachedAccountIdSearch; protected final SearchBuilder TemplateZoneSearch; protected final GenericSearchBuilder TotalSizeByPoolSearch; @@ -266,7 +268,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol else if (scope == ScopeType.ZONE) sql = SELECT_HYPERTYPE_FROM_ZONE_VOLUME; else - logger.error("Unhandled scope type '" + scope + "' when running getHypervisorType on volume id " + volumeId); + s_logger.error("Unhandled scope type '" + scope + "' when running getHypervisorType on volume id " + volumeId); pstmt = txn.prepareAutoCloseStatement(sql); pstmt.setLong(1, volumeId); @@ -295,7 +297,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol } else if (type.equals(HypervisorType.VMware)) { return ImageFormat.OVA; } else { - logger.warn("Do not support hypervisor " + type.toString()); + s_logger.warn("Do not support hypervisor " + type.toString()); return null; } } @@ -481,7 +483,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol builder.set(vo, "updated", new Date()); int rows = update((VolumeVO)vo, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { VolumeVO dbVol = findByIdIncludingRemoved(vo.getId()); if (dbVol != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); @@ -514,7 +516,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update volume: id=" + vo.getId() + ", as there is no such volume exists in the database anymore"); + s_logger.debug("Unable to update volume: id=" + vo.getId() + ", as there is no such volume exists in the database anymore"); } } return rows > 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java index 8922a80..2820061 100644 --- a/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java +++ b/engine/schema/src/com/cloud/storage/dao/VolumeHostDaoImpl.java @@ -21,6 +21,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; @@ -37,6 +38,7 @@ import com.cloud.utils.db.UpdateBuilder; @Component @Local(value = {VolumeHostDao.class}) public class VolumeHostDaoImpl extends GenericDaoBase implements VolumeHostDao { + private static final Logger s_logger = Logger.getLogger(VolumeHostDaoImpl.class); protected final SearchBuilder HostVolumeSearch; protected final SearchBuilder ZoneVolumeSearch; protected final SearchBuilder VolumeSearch; @@ -139,7 +141,7 @@ public class VolumeHostDaoImpl extends GenericDaoBase implem builder.set(vo, "updated", new Date()); int rows = update((VolumeHostVO)vo, sc); - if (rows == 0 && logger.isDebugEnabled()) { + if (rows == 0 && s_logger.isDebugEnabled()) { VolumeHostVO dbVol = findByIdIncludingRemoved(volHost.getId()); if (dbVol != null) { StringBuilder str = new StringBuilder("Unable to update ").append(vo.toString()); @@ -172,7 +174,7 @@ public class VolumeHostDaoImpl extends GenericDaoBase implem .append("; updatedTime=") .append(oldUpdatedTime); } else { - logger.debug("Unable to update objectIndatastore: id=" + volHost.getId() + ", as there is no such object exists in the database anymore"); + s_logger.debug("Unable to update objectIndatastore: id=" + volHost.getId() + ", as there is no such object exists in the database anymore"); } } return rows > 0; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java index 8a27735..2001fae 100644 --- a/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java +++ b/engine/schema/src/com/cloud/upgrade/DatabaseIntegrityChecker.java @@ -24,6 +24,7 @@ import java.sql.SQLException; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.maint.Version; @@ -38,6 +39,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Component @Local(value = {SystemIntegrityChecker.class}) public class DatabaseIntegrityChecker extends AdapterBase implements SystemIntegrityChecker { + private static final Logger s_logger = Logger.getLogger(DatabaseIntegrityChecker.class); @Inject VersionDao _dao; @@ -101,32 +103,32 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg } catch (Exception e) { - logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); + s_logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); throw new CloudRuntimeException("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage(),e); } } catch (Exception e) { - logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); + s_logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); throw new CloudRuntimeException("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage(),e); } } if (noDuplicate) { - logger.debug("No duplicate hosts with the same local storage found in database"); + s_logger.debug("No duplicate hosts with the same local storage found in database"); } else { - logger.error(helpInfo.toString()); + s_logger.error(helpInfo.toString()); } txn.commit(); return noDuplicate; }catch (Exception e) { - logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); + s_logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); throw new CloudRuntimeException("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage(),e); } } catch (Exception e) { - logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); + s_logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage()); throw new CloudRuntimeException("checkDuplicateHostWithTheSameLocalStorage: Exception :" + e.getMessage(),e); } finally @@ -137,7 +139,7 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg } }catch(Exception e) { - logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception:"+ e.getMessage()); + s_logger.error("checkDuplicateHostWithTheSameLocalStorage: Exception:"+ e.getMessage()); } } } @@ -150,7 +152,7 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg String tableName = rs.getString(1); if (tableName.equalsIgnoreCase("usage_event") || tableName.equalsIgnoreCase("usage_port_forwarding") || tableName.equalsIgnoreCase("usage_network_offering")) { num++; - logger.debug("Checking 21to22PremiumUprage table " + tableName + " found"); + s_logger.debug("Checking 21to22PremiumUprage table " + tableName + " found"); } if (num == 3) { return true; @@ -166,7 +168,7 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg boolean found = false; while (rs.next()) { if (column.equalsIgnoreCase(rs.getString(1))) { - logger.debug(String.format("Column %1$s.%2$s.%3$s found", dbName, tableName, column)); + s_logger.debug(String.format("Column %1$s.%2$s.%3$s found", dbName, tableName, column)); found = true; break; } @@ -223,33 +225,33 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg } } if (!hasUsage) { - logger.debug("No cloud_usage found in database, no need to check missed premium upgrade"); + s_logger.debug("No cloud_usage found in database, no need to check missed premium upgrade"); txn.commit(); return true; } if (!check21to22PremiumUprage(conn)) { - logger.error("21to22 premium upgrade missed"); + s_logger.error("21to22 premium upgrade missed"); txn.commit(); return false; } if (!check221to222PremiumUprage(conn)) { - logger.error("221to222 premium upgrade missed"); + s_logger.error("221to222 premium upgrade missed"); txn.commit(); return false; } if (!check222to224PremiumUpgrade(conn)) { - logger.error("222to224 premium upgrade missed"); + s_logger.error("222to224 premium upgrade missed"); txn.commit(); return false; } txn.commit(); return true; } catch (Exception e) { - logger.error("checkMissedPremiumUpgradeFor228: Exception:" + e.getMessage()); + s_logger.error("checkMissedPremiumUpgradeFor228: Exception:" + e.getMessage()); throw new CloudRuntimeException("checkMissedPremiumUpgradeFor228: Exception:" + e.getMessage(), e); } }catch (Exception e) { - logger.error("checkMissedPremiumUpgradeFor228: Exception:"+ e.getMessage()); + s_logger.error("checkMissedPremiumUpgradeFor228: Exception:"+ e.getMessage()); throw new CloudRuntimeException("checkMissedPremiumUpgradeFor228: Exception:" + e.getMessage(),e); } finally @@ -260,7 +262,7 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg } }catch(Exception e) { - logger.error("checkMissedPremiumUpgradeFor228: Exception:"+ e.getMessage()); + s_logger.error("checkMissedPremiumUpgradeFor228: Exception:"+ e.getMessage()); } } } @@ -269,19 +271,19 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg public void check() { GlobalLock lock = GlobalLock.getInternLock("DatabaseIntegrity"); try { - logger.info("Grabbing lock to check for database integrity."); + s_logger.info("Grabbing lock to check for database integrity."); if (!lock.lock(20 * 60)) { throw new CloudRuntimeException("Unable to acquire lock to check for database integrity."); } try { - logger.info("Performing database integrity check"); + s_logger.info("Performing database integrity check"); if (!checkDuplicateHostWithTheSameLocalStorage()) { throw new CloudRuntimeException("checkDuplicateHostWithTheSameLocalStorage detected error"); } if (!checkMissedPremiumUpgradeFor228()) { - logger.error("Your current database version is 2.2.8, management server detected some missed premium upgrade, please contact CloudStack support and attach log file. Thank you!"); + s_logger.error("Your current database version is 2.2.8, management server detected some missed premium upgrade, please contact CloudStack support and attach log file. Thank you!"); throw new CloudRuntimeException("Detected missed premium upgrade"); } } finally { @@ -297,7 +299,7 @@ public class DatabaseIntegrityChecker extends AdapterBase implements SystemInteg try { check(); } catch (Exception e) { - logger.error("System integrity check exception", e); + s_logger.error("System integrity check exception", e); System.exit(1); } return true; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java index fb462c2..0fb2dfe 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java +++ b/engine/schema/src/com/cloud/upgrade/dao/VersionDaoImpl.java @@ -24,6 +24,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.upgrade.dao.VersionVO.Step; @@ -41,6 +42,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Local(value = VersionDao.class) @DB() public class VersionDaoImpl extends GenericDaoBase implements VersionDao { + private static final Logger s_logger = Logger.getLogger(VersionDaoImpl.class); final GenericSearchBuilder CurrentVersionSearch; final SearchBuilder AllFieldsSearch; @@ -74,7 +76,7 @@ public class VersionDaoImpl extends GenericDaoBase implements V @DB public String getCurrentVersion() { try (Connection conn = TransactionLegacy.getStandaloneConnection();) { - logger.debug("Checking to see if the database is at a version before it was the version table is created"); + s_logger.debug("Checking to see if the database is at a version before it was the version table is created"); try ( PreparedStatement pstmt = conn.prepareStatement("SHOW TABLES LIKE 'version'"); @@ -89,8 +91,8 @@ public class VersionDaoImpl extends GenericDaoBase implements V pstmt_domain.executeQuery(); return "2.1.8"; } catch (final SQLException e) { - logger.debug("Assuming the exception means domain_id is not there."); - logger.debug("No version table and no nics table, returning 2.1.7"); + s_logger.debug("Assuming the exception means domain_id is not there."); + s_logger.debug("No version table and no nics table, returning 2.1.7"); return "2.1.7"; } } else { @@ -98,7 +100,7 @@ public class VersionDaoImpl extends GenericDaoBase implements V ResultSet rs_static_nat = pstmt_static_nat.executeQuery();){ return "2.2.1"; } catch (final SQLException e) { - logger.debug("Assuming the exception means static_nat field doesn't exist in firewall_rules table, returning version 2.2.2"); + s_logger.debug("Assuming the exception means static_nat field doesn't exist in firewall_rules table, returning version 2.2.2"); return "2.2.2"; } } @@ -125,7 +127,7 @@ public class VersionDaoImpl extends GenericDaoBase implements V } // Use nics table information and is_static_nat field from firewall_rules table to determine version information - logger.debug("Version table exists, but it's empty; have to confirm that version is 2.2.2"); + s_logger.debug("Version table exists, but it's empty; have to confirm that version is 2.2.2"); try (PreparedStatement pstmt = conn.prepareStatement("SHOW TABLES LIKE 'nics'"); ResultSet rs = pstmt.executeQuery();){ if (!rs.next()) { @@ -136,7 +138,7 @@ public class VersionDaoImpl extends GenericDaoBase implements V throw new CloudRuntimeException("Unable to determine the current version, version table exists and empty, " + "nics table doesn't exist, is_static_nat field exists in firewall_rules table"); } catch (final SQLException e) { - logger.debug("Assuming the exception means static_nat field doesn't exist in firewall_rules table, returning version 2.2.2"); + s_logger.debug("Assuming the exception means static_nat field doesn't exist in firewall_rules table, returning version 2.2.2"); return "2.2.2"; } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java index 70adff4..93ddf9b 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageDaoImpl.java @@ -27,6 +27,7 @@ import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import javax.ejb.Local; @@ -41,6 +42,7 @@ import java.util.TimeZone; @Component @Local(value = {UsageDao.class}) public class UsageDaoImpl extends GenericDaoBase implements UsageDao { + public static final Logger s_logger = Logger.getLogger(UsageDaoImpl.class.getName()); private static final String DELETE_ALL = "DELETE FROM cloud_usage"; private static final String DELETE_ALL_BY_ACCOUNTID = "DELETE FROM cloud_usage WHERE account_id = ?"; private static final String DELETE_ALL_BY_INTERVAL = "DELETE FROM cloud_usage WHERE end_date < DATE_SUB(CURRENT_DATE(), INTERVAL ? DAY)"; @@ -90,7 +92,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error retrieving usage vm instances for account id: " + accountId); + s_logger.error("error retrieving usage vm instances for account id: " + accountId); } finally { txn.close(); } @@ -130,7 +132,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving account to cloud_usage db", ex); + s_logger.error("error saving account to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } } @@ -160,7 +162,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving account to cloud_usage db", ex); + s_logger.error("error saving account to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } } @@ -201,7 +203,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving user stats to cloud_usage db", ex); + s_logger.error("error saving user stats to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } } @@ -228,7 +230,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving user stats to cloud_usage db", ex); + s_logger.error("error saving user stats to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } } @@ -245,7 +247,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage return Long.valueOf(rs.getLong(1)); } } catch (Exception ex) { - logger.error("error getting last account id", ex); + s_logger.error("error getting last account id", ex); } return null; } @@ -262,7 +264,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage return Long.valueOf(rs.getLong(1)); } } catch (Exception ex) { - logger.error("error getting last user stats id", ex); + s_logger.error("error getting last user stats id", ex); } return null; } @@ -281,7 +283,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage templateList.add(Long.valueOf(rs.getLong(1))); } } catch (Exception ex) { - logger.error("error listing public templates", ex); + s_logger.error("error listing public templates", ex); } return templateList; } @@ -298,7 +300,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage return Long.valueOf(rs.getLong(1)); } } catch (Exception ex) { - logger.error("error getting last vm disk stats id", ex); + s_logger.error("error getting last vm disk stats id", ex); } return null; } @@ -331,7 +333,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving vm disk stats to cloud_usage db", ex); + s_logger.error("error saving vm disk stats to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } @@ -377,7 +379,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving vm disk stats to cloud_usage db", ex); + s_logger.error("error saving vm disk stats to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } @@ -444,7 +446,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving usage records to cloud_usage db", ex); + s_logger.error("error saving usage records to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } } @@ -462,7 +464,7 @@ public class UsageDaoImpl extends GenericDaoBase implements Usage txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error removing old cloud_usage records for interval: " + days); + s_logger.error("error removing old cloud_usage records for interval: " + days); } finally { txn.close(); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java index f3ea701..358e638 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageIPAddressDaoImpl.java @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.ejb.Local; import com.cloud.exception.CloudException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.usage.UsageIPAddressVO; @@ -37,6 +38,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {UsageIPAddressDao.class}) public class UsageIPAddressDaoImpl extends GenericDaoBase implements UsageIPAddressDao { + public static final Logger s_logger = Logger.getLogger(UsageIPAddressDaoImpl.class.getName()); protected static final String UPDATE_RELEASED = "UPDATE usage_ip_address SET released = ? WHERE account_id = ? AND public_ip_address = ? and released IS NULL"; protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = @@ -75,7 +77,7 @@ public class UsageIPAddressDaoImpl extends GenericDaoBase implements UsageJobDao { + private static final Logger s_logger = Logger.getLogger(UsageJobDaoImpl.class.getName()); private static final String GET_LAST_JOB_SUCCESS_DATE_MILLIS = "SELECT end_millis FROM cloud_usage.usage_job WHERE end_millis > 0 and success = 1 ORDER BY end_millis DESC LIMIT 1"; @@ -51,7 +53,7 @@ public class UsageJobDaoImpl extends GenericDaoBase implements return rs.getLong(1); } } catch (Exception ex) { - logger.error("error getting last usage job success date", ex); + s_logger.error("error getting last usage job success date", ex); } finally { txn.close(); } @@ -77,7 +79,7 @@ public class UsageJobDaoImpl extends GenericDaoBase implements txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error updating job success date", ex); + s_logger.error("error updating job success date", ex); throw new CloudRuntimeException(ex.getMessage()); } finally { txn.close(); http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java index 20ee05b..abace04 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageLoadBalancerPolicyDaoImpl.java @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.ejb.Local; import com.cloud.exception.CloudException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.usage.UsageLoadBalancerPolicyVO; @@ -37,6 +38,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {UsageLoadBalancerPolicyDao.class}) public class UsageLoadBalancerPolicyDaoImpl extends GenericDaoBase implements UsageLoadBalancerPolicyDao { + public static final Logger s_logger = Logger.getLogger(UsageLoadBalancerPolicyDaoImpl.class.getName()); protected static final String REMOVE_BY_USERID_LBID = "DELETE FROM usage_load_balancer_policy WHERE account_id = ? AND id = ?"; protected static final String UPDATE_DELETED = "UPDATE usage_load_balancer_policy SET deleted = ? WHERE account_id = ? AND id = ? and deleted IS NULL"; @@ -64,7 +66,7 @@ public class UsageLoadBalancerPolicyDaoImpl extends GenericDaoBase implements UsageNetworkDao { + private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); private static final String SELECT_LATEST_STATS = "SELECT u.account_id, u.zone_id, u.host_id, u.host_type, u.network_id, u.bytes_sent, u.bytes_received, u.agg_bytes_received, u.agg_bytes_sent, u.event_time_millis " + "FROM cloud_usage.usage_network u INNER JOIN (SELECT netusage.account_id as acct_id, netusage.zone_id as z_id, max(netusage.event_time_millis) as max_date " @@ -77,7 +79,7 @@ public class UsageNetworkDaoImpl extends GenericDaoBase im } return returnMap; } catch (Exception ex) { - logger.error("error getting recent usage network stats", ex); + s_logger.error("error getting recent usage network stats", ex); } finally { txn.close(); } @@ -97,7 +99,7 @@ public class UsageNetworkDaoImpl extends GenericDaoBase im txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error deleting old usage network stats", ex); + s_logger.error("error deleting old usage network stats", ex); } } @@ -126,7 +128,7 @@ public class UsageNetworkDaoImpl extends GenericDaoBase im txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving usage_network to cloud_usage db", ex); + s_logger.error("error saving usage_network to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java index 4905372..2661d4e 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.ejb.Local; import com.cloud.exception.CloudException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.usage.UsageNetworkOfferingVO; @@ -37,6 +38,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {UsageNetworkOfferingDao.class}) public class UsageNetworkOfferingDaoImpl extends GenericDaoBase implements UsageNetworkOfferingDao { + public static final Logger s_logger = Logger.getLogger(UsageNetworkOfferingDaoImpl.class.getName()); protected static final String UPDATE_DELETED = "UPDATE usage_network_offering SET deleted = ? WHERE account_id = ? AND vm_instance_id = ? AND network_offering_id = ? and deleted IS NULL"; @@ -74,7 +76,7 @@ public class UsageNetworkOfferingDaoImpl extends GenericDaoBase implements UsagePortForwardingRuleDao { + public static final Logger s_logger = Logger.getLogger(UsagePortForwardingRuleDaoImpl.class.getName()); protected static final String REMOVE_BY_USERID_PFID = "DELETE FROM usage_port_forwarding WHERE account_id = ? AND id = ?"; protected static final String UPDATE_DELETED = "UPDATE usage_port_forwarding SET deleted = ? WHERE account_id = ? AND id = ? and deleted IS NULL"; @@ -64,7 +66,7 @@ public class UsagePortForwardingRuleDaoImpl extends GenericDaoBase implements UsageSecurityGroupDao { + public static final Logger s_logger = Logger.getLogger(UsageSecurityGroupDaoImpl.class.getName()); protected static final String UPDATE_DELETED = "UPDATE usage_security_group SET deleted = ? WHERE account_id = ? AND vm_instance_id = ? AND security_group_id = ? and deleted IS NULL"; @@ -74,7 +76,7 @@ public class UsageSecurityGroupDaoImpl extends GenericDaoBase implements UsageStorageDao { + public static final Logger s_logger = Logger.getLogger(UsageStorageDaoImpl.class.getName()); protected static final String REMOVE_BY_USERID_STORAGEID = "DELETE FROM usage_storage WHERE account_id = ? AND id = ? AND storage_type = ?"; protected static final String UPDATE_DELETED = "UPDATE usage_storage SET deleted = ? WHERE account_id = ? AND id = ? AND storage_type = ? and deleted IS NULL"; @@ -106,7 +108,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase im txn.commit(); } catch (Exception e) { txn.rollback(); - logger.error("Error removing usageStorageVO", e); + s_logger.error("Error removing usageStorageVO", e); } finally { txn.close(); } @@ -134,7 +136,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase im txn.commit(); } catch (Exception e) { txn.rollback(); - logger.error("Error updating UsageStorageVO:"+e.getMessage(), e); + s_logger.error("Error updating UsageStorageVO:"+e.getMessage(), e); } finally { txn.close(); } @@ -208,7 +210,7 @@ public class UsageStorageDaoImpl extends GenericDaoBase im } }catch (Exception e) { txn.rollback(); - logger.error("getUsageRecords:Exception:"+e.getMessage(), e); + s_logger.error("getUsageRecords:Exception:"+e.getMessage(), e); } finally { txn.close(); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java index 4817b7d..930ad89 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVMInstanceDaoImpl.java @@ -25,6 +25,7 @@ import java.util.TimeZone; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.usage.UsageVMInstanceVO; @@ -35,6 +36,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {UsageVMInstanceDao.class}) public class UsageVMInstanceDaoImpl extends GenericDaoBase implements UsageVMInstanceDao { + public static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); protected static final String UPDATE_USAGE_INSTANCE_SQL = "UPDATE usage_vm_instance SET end_date = ? " + "WHERE account_id = ? and vm_instance_id = ? and usage_type = ? and end_date IS NULL"; @@ -62,7 +64,7 @@ public class UsageVMInstanceDaoImpl extends GenericDaoBase implements UsageVMSnapshotDao { + public static final Logger s_logger = Logger.getLogger(UsageVMSnapshotDaoImpl.class.getName()); protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT id, zone_id, account_id, domain_id, vm_id, disk_offering_id, size, created, processed " + " FROM usage_vmsnapshot" + " WHERE account_id = ? " + " AND ( (created BETWEEN ? AND ?) OR " + " (created < ? AND processed is NULL) ) ORDER BY created asc"; @@ -60,7 +62,7 @@ public class UsageVMSnapshotDaoImpl extends GenericDaoBase implements UsageVPNUserDao { + public static final Logger s_logger = Logger.getLogger(UsageVPNUserDaoImpl.class.getName()); protected static final String UPDATE_DELETED = "UPDATE usage_vpn_user SET deleted = ? WHERE account_id = ? AND user_id = ? and deleted IS NULL"; protected static final String GET_USAGE_RECORDS_BY_ACCOUNT = "SELECT zone_id, account_id, domain_id, user_id, user_name, created, deleted " + "FROM usage_vpn_user " @@ -69,7 +71,7 @@ public class UsageVPNUserDaoImpl extends GenericDaoBase im txn.commit(); } catch (Exception e) { txn.rollback(); - logger.error("Error updating UsageVPNUserVO:"+e.getMessage(), e); + s_logger.error("Error updating UsageVPNUserVO:"+e.getMessage(), e); } finally { txn.close(); } @@ -139,7 +141,7 @@ public class UsageVPNUserDaoImpl extends GenericDaoBase im } } catch (Exception e) { txn.rollback(); - logger.warn("Error getting usage records", e); + s_logger.warn("Error getting usage records", e); } finally { txn.close(); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java index 7daaf0f..4491c67 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java @@ -24,6 +24,7 @@ import java.util.Map; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.usage.UsageVmDiskVO; @@ -34,6 +35,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Component @Local(value = {UsageVmDiskDao.class}) public class UsageVmDiskDaoImpl extends GenericDaoBase implements UsageVmDiskDao { + private static final Logger s_logger = Logger.getLogger(UsageVmDiskDaoImpl.class.getName()); private static final String SELECT_LATEST_STATS = "SELECT uvd.account_id, uvd.zone_id, uvd.vm_id, uvd.volume_id, uvd.io_read, uvd.io_write, uvd.agg_io_read, uvd.agg_io_write, " + "uvd.bytes_read, uvd.bytes_write, uvd.agg_bytes_read, uvd.agg_bytes_write, uvd.event_time_millis " @@ -81,7 +83,7 @@ public class UsageVmDiskDaoImpl extends GenericDaoBase impl } return returnMap; } catch (Exception ex) { - logger.error("error getting recent usage disk stats", ex); + s_logger.error("error getting recent usage disk stats", ex); } finally { txn.close(); } @@ -101,7 +103,7 @@ public class UsageVmDiskDaoImpl extends GenericDaoBase impl txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error deleting old usage disk stats", ex); + s_logger.error("error deleting old usage disk stats", ex); } } @@ -133,7 +135,7 @@ public class UsageVmDiskDaoImpl extends GenericDaoBase impl txn.commit(); } catch (Exception ex) { txn.rollback(); - logger.error("error saving usage_vm_disk to cloud_usage db", ex); + s_logger.error("error saving usage_vm_disk to cloud_usage db", ex); throw new CloudRuntimeException(ex.getMessage()); } } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java index 96f1e48..7ef4222 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVolumeDaoImpl.java @@ -27,6 +27,7 @@ import java.util.TimeZone; import javax.ejb.Local; import com.cloud.exception.CloudException; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.usage.UsageVolumeVO; @@ -37,6 +38,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {UsageVolumeDao.class}) public class UsageVolumeDaoImpl extends GenericDaoBase implements UsageVolumeDao { + public static final Logger s_logger = Logger.getLogger(UsageVolumeDaoImpl.class.getName()); protected static final String REMOVE_BY_USERID_VOLID = "DELETE FROM usage_volume WHERE account_id = ? AND id = ?"; protected static final String UPDATE_DELETED = "UPDATE usage_volume SET deleted = ? WHERE account_id = ? AND id = ? and deleted IS NULL"; @@ -69,7 +71,7 @@ public class UsageVolumeDaoImpl extends GenericDaoBase impl txn.commit(); } catch (Exception e) { txn.rollback(); - logger.warn("Error removing usageVolumeVO:"+e.getMessage(), e); + s_logger.warn("Error removing usageVolumeVO:"+e.getMessage(), e); } finally { txn.close(); } @@ -91,7 +93,7 @@ public class UsageVolumeDaoImpl extends GenericDaoBase impl txn.commit(); } catch (Exception e) { txn.rollback(); - logger.warn("Error updating UsageVolumeVO", e); + s_logger.warn("Error updating UsageVolumeVO", e); } finally { txn.close(); } @@ -169,7 +171,7 @@ public class UsageVolumeDaoImpl extends GenericDaoBase impl } } catch (Exception e) { txn.rollback(); - logger.warn("Error getting usage records", e); + s_logger.warn("Error getting usage records", e); } finally { txn.close(); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java index e99cfc0..9ae279f 100644 --- a/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java @@ -23,6 +23,7 @@ import java.util.List; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.user.Account; @@ -43,6 +44,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {AccountDao.class}) public class AccountDaoImpl extends GenericDaoBase implements AccountDao { + private static final Logger s_logger = Logger.getLogger(AccountDaoImpl.class); private static final String FIND_USER_ACCOUNT_BY_API_KEY = "SELECT u.id, u.username, u.account_id, u.secret_key, u.state, " + "a.id, a.account_name, a.type, a.domain_id, a.state " + "FROM `cloud`.`user` u, `cloud`.`account` a " + "WHERE u.account_id = a.id AND u.api_key = ? and u.removed IS NULL"; @@ -146,7 +148,7 @@ public class AccountDaoImpl extends GenericDaoBase implements A userAcctPair = new Pair(u, a); } } catch (Exception e) { - logger.warn("Exception finding user/acct by api key: " + apiKey, e); + s_logger.warn("Exception finding user/acct by api key: " + apiKey, e); } return userAcctPair; } @@ -264,7 +266,7 @@ public class AccountDaoImpl extends GenericDaoBase implements A if (!account.getNeedsCleanup()) { account.setNeedsCleanup(true); if (!update(accountId, account)) { - logger.warn("Failed to mark account id=" + accountId + " for cleanup"); + s_logger.warn("Failed to mark account id=" + accountId + " for cleanup"); } } } @@ -284,7 +286,7 @@ public class AccountDaoImpl extends GenericDaoBase implements A domain_id = account_vo.getDomainId(); } catch (Exception e) { - logger.warn("getDomainIdForGivenAccountId: Exception :" + e.getMessage()); + s_logger.warn("getDomainIdForGivenAccountId: Exception :" + e.getMessage()); } finally { return domain_id; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bc02940/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java b/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java index ceefb58..7a8e714 100644 --- a/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java +++ b/engine/schema/src/com/cloud/user/dao/UserStatisticsDaoImpl.java @@ -25,6 +25,7 @@ import java.util.TimeZone; import javax.ejb.Local; +import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.user.UserStatisticsVO; @@ -37,6 +38,7 @@ import com.cloud.utils.db.TransactionLegacy; @Component @Local(value = {UserStatisticsDao.class}) public class UserStatisticsDaoImpl extends GenericDaoBase implements UserStatisticsDao { + private static final Logger s_logger = Logger.getLogger(UserStatisticsDaoImpl.class); private static final String ACTIVE_AND_RECENTLY_DELETED_SEARCH = "SELECT us.id, us.data_center_id, us.account_id, us.public_ip_address, us.device_id, us.device_type, us.network_id, us.agg_bytes_received, us.agg_bytes_sent " + "FROM user_statistics us, account a " + "WHERE us.account_id = a.id AND (a.removed IS NULL OR a.removed >= ?) " + "ORDER BY us.id"; @@ -109,7 +111,7 @@ public class UserStatisticsDaoImpl extends GenericDaoBase