etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

quota: streamlined emailing

This commit is contained in:
Abhinandan Prateek 2015-08-04 16:24:14 +05:30
parent ed28e4ff19
commit f0467c8a2b
4 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/quota/src/org/apache/cloudstack/quota/dao/QuotaAccountDao.java
View File

@ -16,12 +16,16 @@
//under the License.
package org.apache.cloudstack.quota.dao;
import java.util.List;
import org.apache.cloudstack.quota.vo.QuotaAccountVO;
import com.cloud.utils.db.GenericDao;
public interface QuotaAccountDao extends GenericDao<QuotaAccountVO, Long> {
List<QuotaAccountVO> listAll();
QuotaAccountVO findById(Long id);
QuotaAccountVO persist(QuotaAccountVO entity);

26
framework/quota/src/org/apache/cloudstack/quota/dao/QuotaAccountDaoImpl.java
View File

@ -16,6 +16,8 @@
//under the License.
package org.apache.cloudstack.quota.dao;
import java.util.List;
import javax.ejb.Local;
import org.apache.cloudstack.quota.vo.QuotaAccountVO;
@ -29,8 +31,18 @@ import com.cloud.utils.db.TransactionLegacy;
public class QuotaAccountDaoImpl extends GenericDaoBase<QuotaAccountVO, Long> implements QuotaAccountDao {
@Override
public QuotaAccountVO findById(Long id){
QuotaAccountVO result=null;
public List<QuotaAccountVO> listAll() {
List<QuotaAccountVO> result = null;
final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();
result = super.listAll();
TransactionLegacy.open(opendb).close();
return result;
}
@Override
public QuotaAccountVO findById(Long id) {
QuotaAccountVO result = null;
final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();
result = super.findById(id);
@ -39,8 +51,8 @@ public class QuotaAccountDaoImpl extends GenericDaoBase<QuotaAccountVO, Long> im
}
@Override
public QuotaAccountVO persist(QuotaAccountVO entity){
QuotaAccountVO result=null;
public QuotaAccountVO persist(QuotaAccountVO entity) {
QuotaAccountVO result = null;
final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();
result = super.persist(entity);
@ -49,11 +61,11 @@ public class QuotaAccountDaoImpl extends GenericDaoBase<QuotaAccountVO, Long> im
}
@Override
public boolean update(Long id, QuotaAccountVO entity){
boolean result=false;
public boolean update(Long id, QuotaAccountVO entity) {
boolean result = false;
final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
TransactionLegacy.open(TransactionLegacy.USAGE_DB).close();
result=super.update(id, entity);
result = super.update(id, entity);
TransactionLegacy.open(opendb).close();
return result;
}

2
framework/quota/src/org/apache/cloudstack/quota/vo/QuotaAccountVO.java
View File

@ -112,7 +112,7 @@ public class QuotaAccountVO implements InternalIdentity {
}
public Date getQuotaAlertDate() {
return quotaAlertDate == null ? new Date() : quotaAlertDate;
return quotaAlertDate;
}
public void setQuotaAlertDate(Date quotaAlertDate) {

41
usage/src/org/apache/cloudstack/quota/job/QuotaAlertManagerImpl.java
View File

@ -65,6 +65,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
@Component
@Local(value = QuotaAlertManager.class)
@ -91,6 +92,8 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
final static BigDecimal s_minutesInMonth = new BigDecimal(30 * 24 * 60);
final static BigDecimal s_gb = new BigDecimal(1024 * 1024 * 1024);
boolean _smtpDebug = false;
int _pid = 0;
public QuotaAlertManagerImpl() {
@ -113,16 +116,15 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
mergeConfigs(configs, params);
}
final String smtpHost = QuotaConfig.QuotaSmtpHost.value();
int smtpPort = NumbersUtil.parseInt(QuotaConfig.QuotaSmtpPort.value(), 25);
String useAuthStr = QuotaConfig.QuotaSmtpAuthType.value();
final String smtpHost = configs.get(QuotaConfig.QuotaSmtpHost.key());
int smtpPort = NumbersUtil.parseInt(configs.get(QuotaConfig.QuotaSmtpPort.key()), 25);
String useAuthStr = configs.get(QuotaConfig.QuotaSmtpAuthType.key());
boolean useAuth = ((useAuthStr != null) && Boolean.parseBoolean(useAuthStr));
String smtpUsername = QuotaConfig.QuotaSmtpUser.value();
String smtpPassword = QuotaConfig.QuotaSmtpPassword.value();
String emailSender = QuotaConfig.QuotaSmtpSender.value();
_lockAccountEnforcement = QuotaConfig.QuotaEnableEnforcement.value().equalsIgnoreCase("true");
boolean smtpDebug = false;
_emailQuotaAlert = new EmailQuotaAlert(smtpHost, smtpPort, useAuth, smtpUsername, smtpPassword, emailSender, smtpDebug);
String smtpUsername = configs.get(QuotaConfig.QuotaSmtpUser.key());
String smtpPassword = configs.get(QuotaConfig.QuotaSmtpPassword.key());
String emailSender = configs.get(QuotaConfig.QuotaSmtpSender.key());
_lockAccountEnforcement = configs.get(QuotaConfig.QuotaEnableEnforcement.key()).equalsIgnoreCase("true");
_emailQuotaAlert = new EmailQuotaAlert(smtpHost, smtpPort, useAuth, smtpUsername, smtpPassword, emailSender, _smtpDebug);
return true;
}
@ -149,7 +151,7 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
(new ManagedContextRunnable() {
@Override
protected void runInContext() {
System.out.println("Running Quota thread .....");
System.out.println("Running Quota Alert thread .....");
checkAndSendQuotaAlertEmails();
}
}).run();
@ -169,18 +171,18 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
BigDecimal thresholdBalance = quotaAccount.getQuotaMinBalance();
if (accountBalance != null) {
AccountVO account = _accountDao.findById(quotaAccount.getId());
s_logger.info("checkAndSendQuotaAlertEmails accId=" + quotaAccount.getId() + " domId=" + account.getDomainId() + "threshold=" + thresholdBalance + " locakable=" + lockable);
//s_logger.info("Check id " + account.getId() + " bal="+ accountBalance + " alertDate"+ alertDate + " diff" + getDifferenceDays(new Date(), alertDate));
if (accountBalance.compareTo(zeroBalance) <= 0) {
if (_lockAccountEnforcement && lockable == 1) {
if (_lockAccountEnforcement && (lockable == 1)) {
if (account.getType() == Account.ACCOUNT_TYPE_NORMAL) {
lockAccount(account.getId());
}
}
if (balanceDate.compareTo(alertDate) > 0) {
if (alertDate == null || (balanceDate.after(alertDate) && getDifferenceDays(alertDate, new Date()) > 1)) {
deferredQuotaEmailList.add(new DeferredQuotaEmail(account, quotaAccount, QuotaConfig.QuotaEmailTemplateTypes.QUOTA_EMPTY));
}
} else if (accountBalance.compareTo(thresholdBalance) <= 0) {
if (balanceDate.compareTo(alertDate) > 0) {
if (alertDate == null || (balanceDate.after(alertDate) && getDifferenceDays(alertDate, new Date()) > 1)) {
deferredQuotaEmailList.add(new DeferredQuotaEmail(account, quotaAccount, QuotaConfig.QuotaEmailTemplateTypes.QUOTA_LOW));
}
}
@ -227,6 +229,9 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
optionMap.put("domainID", accountDomain.getUuid());
optionMap.put("quotaBalance", QuotaConfig.QuotaCurrencySymbol.value() + " " + balance.toString());
//s_logger.info("accountName" + account.getAccountName() + "accountID" + account.getUuid() + "accountUsers" + userNames + "domainName" + accountDomain.getName() + "domainID"
//+ accountDomain.getUuid());
final StrSubstitutor templateEngine = new StrSubstitutor(optionMap);
final String subject = templateEngine.replace(emailTemplate.getTemplateSubject());
final String body = templateEngine.replace(emailTemplate.getTemplateBody());
@ -353,7 +358,7 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
smtpTrans.sendMessage(msg, msg.getAllRecipients());
smtpTrans.close();
} else {
throw new CloudRuntimeException("Unable to send quota alert email");
throw new CloudRuntimeException("Unable to create smtp session.");
}
}
}
@ -366,6 +371,11 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
return dt;
}
public static long getDifferenceDays(Date d1, Date d2) {
long diff = d2.getTime() - d1.getTime();
return TimeUnit.DAYS.convert(diff, TimeUnit.MILLISECONDS);
}
protected boolean lockAccount(long accountId) {
final short opendb = TransactionLegacy.currentTxn().getDatabaseId();
TransactionLegacy.open(TransactionLegacy.CLOUD_DB).close();
@ -401,4 +411,5 @@ public class QuotaAlertManagerImpl extends ManagerBase implements QuotaAlertMana
TransactionLegacy.open(opendb).close();
return success;
}
}