CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 29 Packages Projects Releases Wiki Activity

FINERACT-1754: Turn off unnecessary logging

Browse Source
This commit is contained in:
Adam Saghy
2022-09-28 00:06:52 +02:00
committed by Aleksandar Vidakovic
parent d4517f4a4d
commit af63dbc9fa
30 changed files with 75 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/jobs/updatetrialbalancedetails/UpdateTrialBalanceDetailsTasklet.java
+1 -1
View File
@@ -62,7 +62,7 @@ public class UpdateTrialBalanceDetailsTasklet implements Tasklet {
.append("from acc_gl_journal_entry je WHERE je.transaction_date = ? ")
.append("group by je.account_id, je.office_id, je.transaction_date, Date(je.entry_date)");
final int result = jdbcTemplate.update(sqlBuilder.toString(), tbGap);
log.info("{}: Records affected by updateTrialBalanceDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result);
log.debug("{}: Records affected by updateTrialBalanceDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result);
}
String distinctOfficeQuery = "select distinct(office_id) from m_trial_balance where closing_balance is null group by office_id";
final List<Long> officeIds = jdbcTemplate.queryForList(distinctOfficeQuery, Long.class);
fineract-provider/src/main/java/org/apache/fineract/commands/service/AuditReadPlatformServiceImpl.java
+2 -2
View File
@@ -199,7 +199,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
this.columnValidator.validateSqlInjection(sqlBuilder.toString(), parameters.limitSql());
}
log.info("sql: {}", sqlBuilder);
log.debug("sql: {}", sqlBuilder);
return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlBuilder.toString(), extraCriteria.getArguments(), rm);
}
@@ -238,7 +238,7 @@ public class AuditReadPlatformServiceImpl implements AuditReadPlatformService {
}
sql += extraCriteria.getSQLTemplate();
sql += groupAndOrderBySQL;
log.info("sql: {}", sql);
log.debug("sql: {}", sql);
return this.jdbcTemplate.query(sql, rm, extraCriteria.getArguments()); // NOSONAR
}
fineract-provider/src/main/java/org/apache/fineract/commands/service/PortfolioCommandSourceWritePlatformServiceImpl.java
+1 -1
View File
@@ -91,7 +91,7 @@ public class PortfolioCommandSourceWritePlatformServiceImpl implements Portfolio
result = this.processAndLogCommandService.executeCommand(wrapper, command, isApprovedByChecker);
numberOfRetries = maxNumberOfRetries + 1;
} catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) {
log.info("The following command {} has been retried {} time(s)", command.json(), numberOfRetries);
log.debug("The following command {} has been retried {} time(s)", command.json(), numberOfRetries);
/***
* Fail if the transaction has been retired for maxNumberOfRetries
**/
fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/jobs/getdeliveryreportsfromsmsgateway/GetDeliveryReportsFromSmsGatewayTasklet.java
+2 -2
View File
@@ -89,13 +89,13 @@ public class GetDeliveryReportsFromSmsGatewayTasklet implements Tasklet {
smsMessageRepository.save(smsMessage);
if (statusChanged) {
log.info("Status of SMS message id: {} successfully changed to {}", smsMessage.getId(), statusType);
log.debug("Status of SMS message id: {} successfully changed to {}", smsMessage.getId(), statusType);
}
}
}
}
if (!CollectionUtils.isEmpty(smsMessageDeliveryReportDataCollection)) {
log.info("{} delivery report(s) successfully received from the intermediate gateway - sms",
log.debug("{} delivery report(s) successfully received from the intermediate gateway - sms",
smsMessageDeliveryReportDataCollection.size());
}
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/jobs/updateemailoutboundwithcampaignmessage/UpdateEmailOutboundWithCampaignMessageTasklet.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class UpdateEmailOutboundWithCampaignMessageTasklet implements Tasklet {
LocalDateTime tenantDateNow = TenantDateTimeUtil.tenantDateTime();
LocalDateTime nextTriggerDate = emailCampaignData.getNextTriggerDate().toLocalDateTime();
log.info("tenant time {} trigger time {}", tenantDateNow, nextTriggerDate);
log.debug("tenant time {} trigger time {}", tenantDateNow, nextTriggerDate);
if (nextTriggerDate.isBefore(tenantDateNow)) {
insertDirectCampaignIntoEmailOutboundTable(emailCampaignData.getParamValue(), emailCampaignData.getEmailSubject(),
emailCampaignData.getMessage(), emailCampaignData.getCampaignName(), emailCampaignData.getId());
fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/jobs/updatesmsoutboundwithcampaignmessage/UpdateSmsOutboundWithCampaignMessageTasklet.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class UpdateSmsOutboundWithCampaignMessageTasklet implements Tasklet {
LocalDateTime tenantDateNow = TenantDateTimeUtil.tenantDateTime();
LocalDateTime nextTriggerDate = smsCampaign.getNextTriggerDate();
log.info("tenant time {} trigger time {} {}", tenantDateNow, nextTriggerDate,
log.debug("tenant time {} trigger time {} {}", tenantDateNow, nextTriggerDate,
JobName.UPDATE_SMS_OUTBOUND_WITH_CAMPAIGN_MESSAGE.name());
if (nextTriggerDate.isBefore(tenantDateNow)) {
smsCampaignWritePlatformService.insertDirectCampaignIntoSmsOutboundTable(smsCampaign);
fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/sms/service/SmsCampaignWritePlatformServiceJpaImpl.java
+1 -1
View File
@@ -452,7 +452,7 @@ public class SmsCampaignWritePlatformServiceJpaImpl implements SmsCampaignWriteP
final String response = this.genericDataService.generateJsonFromGenericResultsetData(results);
resultList = new ObjectMapper().readValue(response, new TypeReference<List<HashMap<String, Object>>>() {});
} catch (JsonParseException e) {
log.info("Conversion of report query results to JSON failed", e);
log.warn("Conversion of report query results to JSON failed", e);
return resultList;
}
// loop changes array date to string date
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/exception/MultiException.java
+2 -2
View File
@@ -81,10 +81,10 @@ public class MultiException extends Exception {
@Override
@SuppressWarnings("RegexpSinglelineJava")
public void printStackTrace() {
LOG.info("{}", super.getMessage());
LOG.error("{}", super.getMessage());
int i = 0;
for (Throwable e : throwables) {
LOG.info("{}.", ++i);
LOG.error("{}.", ++i);
e.printStackTrace();
}
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/service/AbandonedConnectionCleanupShutdownListener.java
+2 -2
View File
@@ -60,13 +60,13 @@ public class AbandonedConnectionCleanupShutdownListener implements ApplicationLi
java.sql.DriverManager.deregisterDriver(driver);
LOG.info("JDBC driver de-registered successfully");
} catch (Throwable t) {
LOG.error("Exception occured while deristering jdbc driver", t);
LOG.error("Exception occurred while de-register jdbc driver", t);
}
}
try {
Thread.sleep(2000L);
} catch (Exception e) {
LOG.error("Exception Occcured while trying to sleep.", e);
LOG.error("Exception Occcurred while trying to sleep.", e);
}
}
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/EntityDatatableChecksWritePlatformServiceImpl.java
+3 -3
View File
@@ -107,7 +107,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData
final String foreignKeyColumnName = EntityTables.getForeignKeyColumnNameOnDatatable(entity);
final boolean columnExist = datatableData.hasColumn(foreignKeyColumnName);
LOG.info("{} has column {} ? {}", datatableData.getRegisteredTableName(), foreignKeyColumnName, columnExist);
LOG.debug("{} has column {} ? {}", datatableData.getRegisteredTableName(), foreignKeyColumnName, columnExist);
if (!columnExist) {
throw new EntityDatatableCheckNotSupportedException(datatableData.getRegisteredTableName(), entity);
@@ -170,7 +170,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData
final String datatableName = t.getDatatableName();
final Long countEntries = readWriteNonCoreDataService.countDatatableEntries(datatableName, entityId, foreignKeyColumn);
LOG.info("The are {} entries in the table {}", countEntries, datatableName);
LOG.debug("The are {} entries in the table {}", countEntries, datatableName);
if (countEntries.intValue() == 0) {
reqDatatables.add(datatableName);
}
@@ -199,7 +199,7 @@ public class EntityDatatableChecksWritePlatformServiceImpl implements EntityData
final String datatableName = t.getDatatableName();
final Long countEntries = readWriteNonCoreDataService.countDatatableEntries(datatableName, entityId, foreignKeyColumn);
LOG.info("The are {} entries in the table {}", countEntries, datatableName);
LOG.debug("The are {} entries in the table {}", countEntries, datatableName);
if (countEntries.intValue() == 0) {
reqDatatables.add(datatableName);
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
+6 -6
View File
@@ -104,7 +104,7 @@ public class ReadReportingServiceImpl implements ReadReportingService {
final StringBuilder writer = new StringBuilder();
final List<ResultsetColumnHeaderData> columnHeaders = result.getColumnHeaders();
log.info("NO. of Columns: {}", columnHeaders.size());
log.debug("NO. of Columns: {}", columnHeaders.size());
final Integer chSize = columnHeaders.size();
for (int i = 0; i < chSize; i++) {
writer.append('"' + columnHeaders.get(i).getColumnName() + '"');
@@ -122,7 +122,7 @@ public class ReadReportingServiceImpl implements ReadReportingService {
String currVal;
final String doubleQuote = "\"";
final String twoDoubleQuotes = doubleQuote + doubleQuote;
log.info("NO. of Rows: {}", data.size());
log.debug("NO. of Rows: {}", data.size());
for (ResultsetRowData element : data) {
row = element.getRow();
rSize = row.size();
@@ -254,7 +254,7 @@ public class ReadReportingServiceImpl implements ReadReportingService {
final List<ResultsetRowData> data = result.getData();
List<Object> row;
log.info("NO. of Columns: {}", columnHeaders.size());
log.debug("NO. of Columns: {}", columnHeaders.size());
final Integer chSize = columnHeaders.size();
final Document document = new Document(PageSize.B0.rotate());
@@ -276,7 +276,7 @@ public class ReadReportingServiceImpl implements ReadReportingService {
Integer rSize;
String currColType;
String currVal;
log.info("NO. of Rows: {}", data.size());
log.debug("NO. of Rows: {}", data.size());
for (ResultsetRowData element : data) {
row = element.getRow();
rSize = row.size();
@@ -484,14 +484,14 @@ public class ReadReportingServiceImpl implements ReadReportingService {
@Override
public GenericResultsetData retrieveGenericResultSetForSmsEmailCampaign(String name, String type, Map<String, String> queryParams) {
final long startTime = System.currentTimeMillis();
log.info("STARTING REPORT: {} Type: {}", name, type);
log.debug("STARTING REPORT: {} Type: {}", name, type);
final String sql = sqlToRunForSmsEmailCampaign(name, type, queryParams);
final GenericResultsetData result = this.genericDataService.fillGenericResultSet(sql);
final long elapsed = System.currentTimeMillis() - startTime;
log.info("FINISHING Report/Request Name: {} - {} Elapsed Time: {}", name, type, elapsed);
log.debug("FINISHING Report/Request Name: {} - {} Elapsed Time: {}", name, type, elapsed);
return result;
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+6 -6
View File
@@ -184,7 +184,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
}
private void logAsErrorUnexpectedDataIntegrityException(final Exception dve) {
LOG.error("Error occured.", dve);
LOG.error("Error occurred.", dve);
}
@Transactional
@@ -806,7 +806,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
try {
codeId = this.jdbcTemplate.queryForObject(checkColumnCodeMapping.toString(), Integer.class);
} catch (final EmptyResultDataAccessException e) {
LOG.info("Error occured.", e);
LOG.warn("Error occurred.", e);
}
return ObjectUtils.defaultIfNull(codeId, 0);
}
@@ -1228,11 +1228,11 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
pkValue = datatableId;
}
final String sql = getUpdateSql(grs.getColumnHeaders(), dataTableName, pkName, pkValue, changes);
LOG.info("Update sql: {}", sql);
LOG.debug("Update sql: {}", sql);
if (StringUtils.isNotBlank(sql)) {
this.jdbcTemplate.update(sql);
} else {
LOG.info("No Changes");
LOG.debug("No Changes");
}
}
@@ -1574,7 +1574,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
addSql = "insert into " + sqlGenerator.escape(datatable) + " (" + sqlGenerator.escape(fkName) + " " + insertColumns + ")"
+ " select " + appTableId + " as id" + selectColumns;
LOG.info("{}", addSql);
LOG.debug("{}", addSql);
return addSql;
}
@@ -1624,7 +1624,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
+ ", score )" + " select " + appTableId + " as id" + selectColumns
+ " , ( SELECT SUM( code_score ) FROM m_code_value WHERE m_code_value.id IN (" + scoresId + " ) ) as score";
LOG.info("{}", vaddSql);
LOG.debug("{}", vaddSql);
return vaddSql;
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/documentmanagement/contentrepository/S3ContentRepository.java
+1 -1
View File
@@ -164,7 +164,7 @@ public class S3ContentRepository implements ContentRepository {
private S3Object getObject(String key) {
try {
log.info("Downloading an object from Amazon S3 Bucket: {}, location: {}", this.s3BucketName, key);
log.debug("Downloading an object from Amazon S3 Bucket: {}, location: {}", this.s3BucketName, key);
return this.s3Client.getObject(new GetObjectRequest(this.s3BucketName, key));
} catch (AmazonClientException ase) {
throw new ContentManagementException(key, ase.getMessage(), ase);
fineract-provider/src/main/java/org/apache/fineract/infrastructure/hooks/processor/ProcessorHelper.java
+3 -3
View File
@@ -102,12 +102,12 @@ public final class ProcessorHelper {
@Override
public void onResponse(@SuppressWarnings("unused") Call call, retrofit2.Response response) {
LOG.info("URL: {} - Status: {}", url, response.code());
LOG.debug("URL: {} - Status: {}", url, response.code());
}
@Override
public void onFailure(@SuppressWarnings("unused") Call call, Throwable t) {
LOG.error("URL: {} - Retrofit failure occured", url, t);
LOG.error("URL: {} - Retrofit failure occurred", url, t);
}
};
}
@@ -129,7 +129,7 @@ public final class ProcessorHelper {
@Override
public void onResponse(@SuppressWarnings("unused") Call call, retrofit2.Response response) {
LOG.info("URL: {} - Status: {}", url, response.code());
LOG.debug("URL: {} - Status: {}", url, response.code());
}
@Override
fineract-provider/src/main/java/org/apache/fineract/infrastructure/jobs/service/updatenpa/UpdateNpaTasklet.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class UpdateNpaTasklet implements Tasklet {
final int result = jdbcTemplate.update(updateSqlBuilder.toString(), user.getId(), DateUtils.getOffsetDateTimeOfTenant());
log.info("{}: Records affected by updateNPA: {}", ThreadLocalContextUtil.getTenant().getName(), result);
log.debug("{}: Records affected by updateNPA: {}", ThreadLocalContextUtil.getTenant().getName(), result);
return RepeatStatus.FINISHED;
}
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/security/filter/TenantAwareTenantIdentifierFilter.java
+1 -1
View File
@@ -150,7 +150,7 @@ public class TenantAwareTenantIdentifierFilter extends GenericFilterBean {
} finally {
task.stop();
final PlatformRequestLog logRequest = PlatformRequestLog.from(task, request);
log.info("{}", this.toApiJsonSerializer.serialize(logRequest));
log.debug("{}", this.toApiJsonSerializer.serialize(logRequest));
}
}
fineract-provider/src/main/java/org/apache/fineract/infrastructure/sms/scheduler/SmsMessageScheduledJobServiceImpl.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class SmsMessageScheduledJobServiceImpl implements SmsMessageScheduledJob
}
this.smsMessageRepository.saveAll(smsMessages);
request.append(SmsMessageApiQueueResourceData.toJsonString(apiQueueResourceDatas));
log.info("Sending triggered SMS to specific provider with request - {}", request);
log.debug("Sending triggered SMS to specific provider with request - {}", request);
this.triggeredExecutorService.execute(new SmsTask(apiQueueResourceDatas, ThreadLocalContextUtil.getContext()));
} catch (Exception e) {
log.error("Error occured.", e);
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/recalculateinterestforloan/RecalculateInterestForLoanTasklet.java
+5 -5
View File
@@ -63,7 +63,7 @@ public class RecalculateInterestForLoanTasklet implements Tasklet {
Map<String, JobParameter> jobParameters = chunkContext.getStepContext().getStepExecution().getJobParameters().getParameters();
if (!jobParameters.isEmpty()) {
final String officeId = (String) jobParameters.get("officeId").getValue();
log.info("recalculateInterest: officeId={}", officeId);
log.debug("recalculateInterest: officeId={}", officeId);
Long officeIdLong = Long.valueOf(officeId);
final OfficeData office = officeReadPlatformService.retrieveOffice(officeIdLong);
@@ -82,14 +82,14 @@ public class RecalculateInterestForLoanTasklet implements Tasklet {
if (!loanIds.isEmpty()) {
List<Throwable> errors = new ArrayList<>();
for (Long loanId : loanIds) {
log.info("recalculateInterest: Loan ID = {}", loanId);
log.debug("recalculateInterest: Loan ID = {}", loanId);
int numberOfRetries = 0;
while (numberOfRetries <= maxNumberOfRetries) {
try {
loanWritePlatformService.recalculateInterest(loanId);
numberOfRetries = maxNumberOfRetries + 1;
} catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) {
log.info("Recalulate interest job has been retried {} time(s)", numberOfRetries);
log.debug("Recalulate interest job has been retried {} time(s)", numberOfRetries);
if (numberOfRetries >= maxNumberOfRetries) {
log.error(
"Recalulate interest job has been retried for the max allowed attempts of {} and will be rolled back",
@@ -113,7 +113,7 @@ public class RecalculateInterestForLoanTasklet implements Tasklet {
}
i++;
}
log.info("recalculateInterest: Loans count {}", i);
log.debug("recalculateInterest: Loans count {}", i);
}
if (!errors.isEmpty()) {
throw new JobExecutionException(errors);
@@ -136,7 +136,7 @@ public class RecalculateInterestForLoanTasklet implements Tasklet {
do {
int totalFilteredRecords = loanIds.size();
log.info("Starting accrual - total filtered records - {}", totalFilteredRecords);
log.debug("Starting accrual - total filtered records - {}", totalFilteredRecords);
recalculateInterest(loanIds, threadPoolSize, batchSize, executorService);
maxLoanIdInList += pageSize + 1;
loanIds = Collections.synchronizedList(
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/jobs/updateloanarrearsageing/UpdateLoanArrearsAgeingTasklet.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class UpdateLoanArrearsAgeingTasklet implements Tasklet {
result += i;
}
log.info("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result);
log.debug("{}: Records affected by updateLoanArrearsAgeingDetails: {}", ThreadLocalContextUtil.getTenant().getName(), result);
return RepeatStatus.FINISHED;
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+1 -1
View File
@@ -913,7 +913,7 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
Long[] childLoanId = new Long[repayments.size()];
for (int i = 0; i < repayments.size(); i++) {
jsonObject = repayments.get(i).getAsJsonObject();
log.info("{}", jsonObject.toString());
log.debug("{}", jsonObject.toString());
childLoanId[i] = jsonObject.get("loanId").getAsLong();
}
int j = 0;
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/RecalculateInterestPoster.java
+5 -4
View File
@@ -62,18 +62,19 @@ public class RecalculateInterestPoster implements Callable<Void> {
if (!loanIds.isEmpty()) {
List<Throwable> errors = new ArrayList<>();
for (Long loanId : loanIds) {
LOG.info("Loan ID {}", loanId);
LOG.debug("Loan ID {}", loanId);
Integer numberOfRetries = 0;
while (numberOfRetries <= maxNumberOfRetries) {
try {
this.loanWritePlatformService.recalculateInterest(loanId);
numberOfRetries = maxNumberOfRetries + 1;
} catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) {
LOG.info("Recalulate interest job has been retried {} time(s)", numberOfRetries);
LOG.debug("Recalculate interest job has been retried {} time(s)", numberOfRetries);
// Fail if the transaction has been retired for
// maxNumberOfRetries
if (numberOfRetries >= maxNumberOfRetries) {
LOG.error("Recalulate interest job has been retried for the max allowed attempts of {} and will be rolled back",
LOG.error(
"Recalculate interest job has been retried for the max allowed attempts of {} and will be rolled back",
numberOfRetries);
errors.add(exception);
break;
@@ -96,7 +97,7 @@ public class RecalculateInterestPoster implements Callable<Void> {
}
i++;
}
LOG.info("Loans count {}", i);
LOG.debug("Loans count {}", i);
}
if (!errors.isEmpty()) {
throw new JobExecutionException(errors);
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/jobs/applyannualfeeforsavings/ApplyAnnualFeeForSavingsTasklet.java
+1 -1
View File
@@ -58,7 +58,7 @@ public class ApplyAnnualFeeForSavingsTasklet implements Tasklet {
}
}
log.info("{}: Records affected by applyAnnualFeeForSavings: {}", ThreadLocalContextUtil.getTenant().getName(),
log.debug("{}: Records affected by applyAnnualFeeForSavings: {}", ThreadLocalContextUtil.getTenant().getName(),
annualFeeData.size());
return RepeatStatus.FINISHED;
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/jobs/generateadhocclientschhedule/GenerateAdhocClientScheduleTasklet.java
+3 -3
View File
@@ -85,18 +85,18 @@ public class GenerateAdhocClientScheduleTasklet implements Tasklet {
.append(") ").append(adhoc.getQuery());
if (insertSqlBuilder.length() > 0) {
final int result = jdbcTemplate.update(insertSqlBuilder.toString());
log.info("{}: Records affected by generateClientSchedule: {}", ThreadLocalContextUtil.getTenant().getName(),
log.debug("{}: Records affected by generateClientSchedule: {}", ThreadLocalContextUtil.getTenant().getName(),
result);
jdbcTemplate.update("UPDATE m_adhoc SET last_run=? WHERE id=?", new Date(), adhoc.getId());
}
} else {
log.info("{}: Skipping execution of {}, scheduled for execution on {}", ThreadLocalContextUtil.getTenant().getName(),
log.debug("{}: Skipping execution of {}, scheduled for execution on {}", ThreadLocalContextUtil.getTenant().getName(),
adhoc.getName(), next);
}
});
} else {
log.info("{}: Nothing to update by generateClientSchedule", ThreadLocalContextUtil.getTenant().getName());
log.debug("{}: Nothing to update by generateClientSchedule", ThreadLocalContextUtil.getTenant().getName());
}
return RepeatStatus.FINISHED;
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/jobs/payduesavingscharges/PayDueSavingsChargesTasklet.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class PayDueSavingsChargesTasklet implements Tasklet {
log.error("Apply Charges due for savings failed for account: {}", savingsAccountReference.getAccountNo(), ex);
}
}
log.info("{}: Records affected by applyDueChargesForSavings: {}", ThreadLocalContextUtil.getTenant().getName(),
log.debug("{}: Records affected by applyDueChargesForSavings: {}", ThreadLocalContextUtil.getTenant().getName(),
chargesDueData.size());
if (!exceptions.isEmpty()) {
throw new JobExecutionException(exceptions);
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/jobs/postinterestforsavings/PostInterestForSavingTasklet.java
+7 -7
View File
@@ -80,20 +80,20 @@ public class PostInterestForSavingTasklet implements Tasklet {
long start = System.currentTimeMillis();
log.info("Reading Savings Account Data!");
log.debug("Reading Savings Account Data!");
List<SavingsAccountData> savingsAccounts = savingAccountReadPlatformService
.retrieveAllSavingsDataForInterestPosting(backdatedTxnsAllowedTill, pageSize, ACTIVE.getValue(), maxSavingsIdInList);
if (savingsAccounts != null && savingsAccounts.size() > 0) {
savingsAccounts = Collections.synchronizedList(savingsAccounts);
long finish = System.currentTimeMillis();
log.info("Done fetching Data within {} milliseconds", finish - start);
log.debug("Done fetching Data within {} milliseconds", finish - start);
queue.add(savingsAccounts);
if (!CollectionUtils.isEmpty(queue)) {
do {
int totalFilteredRecords = savingsAccounts.size();
log.info("Starting Interest posting - total records - {}", totalFilteredRecords);
log.debug("Starting Interest posting - total records - {}", totalFilteredRecords);
List<SavingsAccountData> queueElement = queue.element();
maxSavingsIdInList = queueElement.get(queueElement.size() - 1).getId();
postInterest(queue.remove(), threadPoolSize, executorService, backdatedTxnsAllowedTill, pageSize, maxSavingsIdInList);
@@ -132,7 +132,7 @@ public class PostInterestForSavingTasklet implements Tasklet {
}
while (queue.size() <= queueSize) {
log.info("Fetching while threads are running!");
log.debug("Fetching while threads are running!");
List<SavingsAccountData> savingsAccountDataList = Collections.synchronizedList(this.savingAccountReadPlatformService
.retrieveAllSavingsDataForInterestPosting(backdatedTxnsAllowedTill, pageSize, ACTIVE.getValue(), maxId));
if (savingsAccountDataList.isEmpty()) {
@@ -184,19 +184,19 @@ public class PostInterestForSavingTasklet implements Tasklet {
}
while (queue.size() <= queueSize) {
log.info("Fetching while threads are running!..:: this is not supposed to run........");
log.debug("Fetching while threads are running!..:: this is not supposed to run........");
savingsAccounts = Collections.synchronizedList(this.savingAccountReadPlatformService
.retrieveAllSavingsDataForInterestPosting(backdatedTxnsAllowedTill, pageSize, ACTIVE.getValue(), maxId));
if (savingsAccounts.isEmpty()) {
break;
}
maxId = savingsAccounts.get(savingsAccounts.size() - 1).getId();
log.info("Add to the Queue");
log.debug("Add to the Queue");
queue.add(savingsAccounts);
}
checkCompletion(responses);
log.info("Queue size {}", queue.size());
log.debug("Queue size {}", queue.size());
} catch (InterruptedException e1) {
log.error("Interrupted while postInterest", e1);
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/jobs/updatedepositsaccountmaturitydetails/UpdateDepositsAccountMaturityDetailsTasklet.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class UpdateDepositsAccountMaturityDetailsTasklet implements Tasklet {
}
}
log.info("{}: Records affected by updateMaturityDetailsOfDepositAccounts: {}", ThreadLocalContextUtil.getTenant().getName(),
log.debug("{}: Records affected by updateMaturityDetailsOfDepositAccounts: {}", ThreadLocalContextUtil.getTenant().getName(),
depositAccounts.size());
return RepeatStatus.FINISHED;
}
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java
+6 -6
View File
@@ -355,7 +355,7 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
if (account.getGsim() != null) {
isGsim = true;
LOG.info("is gsim");
LOG.debug("is gsim");
}
checkClientOrGroupActive(account);
@@ -379,13 +379,13 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
LOG.debug("Deposit account has been created: {} ", deposit);
GroupSavingsIndividualMonitoring gsim = gsimRepository.findById(account.getGsim().getId()).orElseThrow();
LOG.info("parent deposit : {} ", gsim.getParentDeposit());
LOG.info("child account : {} ", savingsId);
LOG.debug("parent deposit : {} ", gsim.getParentDeposit());
LOG.debug("child account : {} ", savingsId);
BigDecimal currentBalance = gsim.getParentDeposit();
BigDecimal newBalance = currentBalance.add(transactionAmount);
gsim.setParentDeposit(newBalance);
gsimRepository.save(gsim);
LOG.info("balance after making deposit : {} ",
LOG.debug("balance after making deposit : {} ",
gsimRepository.findById(account.getGsim().getId()).orElseThrow().getParentDeposit());
}
@@ -663,13 +663,13 @@ public class SavingsAccountWritePlatformServiceJpaRepositoryImpl implements Savi
}
long startPosting = System.currentTimeMillis();
LOG.info("Interest Posting Start Here at {}", startPosting);
LOG.debug("Interest Posting Start Here at {}", startPosting);
savingsAccountData = this.savingsAccountInterestPostingService.postInterest(mc, today, isInterestTransfer,
isSavingsInterestPostingAtCurrentPeriodEnd, financialYearBeginningMonth, postInterestOnDate, backdatedTxnsAllowedTill,
savingsAccountData);
long endPosting = System.currentTimeMillis();
LOG.info("Interest Posting Ends within {}", endPosting - startPosting);
LOG.debug("Interest Posting Ends within {}", endPosting - startPosting);
if (!backdatedTxnsAllowedTill) {
List<SavingsAccountTransactionData> transactions = savingsAccountData.getSavingsAccountTransactionData();
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularInterestPoster.java
+6 -6
View File
@@ -96,7 +96,7 @@ public class SavingsSchedularInterestPoster implements Callable<Void> {
// List<BatchResponse> responseList = new ArrayList<>();
long start = System.currentTimeMillis();
LOG.info("Thread Execution Started at {}", start);
LOG.debug("Thread Execution Started at {}", start);
List<Throwable> errors = new ArrayList<>();
int i = 0;
@@ -113,11 +113,11 @@ public class SavingsSchedularInterestPoster implements Callable<Void> {
long endPosting = System.currentTimeMillis();
savingsAccountDataList.add(savingsAccountDataRet);
LOG.info("Posting Completed Within {}", endPosting - startPosting);
LOG.debug("Posting Completed Within {}", endPosting - startPosting);
numberOfRetries = maxNumberOfRetries + 1;
} catch (CannotAcquireLockException | ObjectOptimisticLockingFailureException exception) {
LOG.info("Interest posting job for savings ID {} has been retried {} time(s)", savingsAccountData.getId(),
LOG.debug("Interest posting job for savings ID {} has been retried {} time(s)", savingsAccountData.getId(),
numberOfRetries);
// Fail if the transaction has been retired for
// maxNumberOfRetries
@@ -166,7 +166,7 @@ public class SavingsSchedularInterestPoster implements Callable<Void> {
}
long end = System.currentTimeMillis();
LOG.info("Time To Finish the batch {} by thread {} for accounts {}", end - start, Thread.currentThread().getId(),
LOG.debug("Time To Finish the batch {} by thread {} for accounts {}", end - start, Thread.currentThread().getId(),
savingAccounts.size());
return null;
}
@@ -297,10 +297,10 @@ public class SavingsSchedularInterestPoster implements Callable<Void> {
this.jdbcTemplate.batchUpdate(queryForSavingsUpdate, paramsForSavingsSummary);
this.jdbcTemplate.batchUpdate(queryForTransactionInsertion, paramsForTransactionInsertion);
this.jdbcTemplate.batchUpdate(queryForTransactionUpdate, paramsForTransactionUpdate);
LOG.info("`Total No Of Interest Posting:` {}", transRefNo.size());
LOG.debug("`Total No Of Interest Posting:` {}", transRefNo.size());
List<SavingsAccountTransactionData> savingsAccountTransactionDataList = fetchTransactionsFromIds(transRefNo);
if (savingsAccountDataList != null) {
LOG.info("Fetched Transactions from DB: {}", savingsAccountTransactionDataList.size());
LOG.debug("Fetched Transactions from DB: {}", savingsAccountTransactionDataList.size());
}
HashMap<String, SavingsAccountTransactionData> savingsAccountTransactionMap = new HashMap<>();
fineract-provider/src/main/java/org/apache/fineract/useradministration/domain/AppUser.java
-5
View File
@@ -38,7 +38,6 @@ import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.fineract.infrastructure.core.api.JsonCommand;
import org.apache.fineract.infrastructure.core.data.EnumOptionData;
@@ -48,7 +47,6 @@ import org.apache.fineract.infrastructure.security.domain.PlatformUser;
import org.apache.fineract.infrastructure.security.exception.NoAuthorizationException;
import org.apache.fineract.infrastructure.security.service.PlatformPasswordEncoder;
import org.apache.fineract.infrastructure.security.service.RandomPasswordGenerator;
import org.apache.fineract.infrastructure.security.utils.LogParameterEscapeUtil;
import org.apache.fineract.organisation.office.domain.Office;
import org.apache.fineract.organisation.staff.domain.Staff;
import org.apache.fineract.portfolio.client.domain.Client;
@@ -57,7 +55,6 @@ import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
@Slf4j
@Entity
@Table(name = "m_appuser", uniqueConstraints = @UniqueConstraint(columnNames = { "username" }, name = "username_org"))
public class AppUser extends AbstractPersistableCustom implements PlatformUser {
@@ -638,8 +635,6 @@ public class AppUser extends AbstractPersistableCustom implements PlatformUser {
public void validateHasPermissionTo(final String function) {
if (hasNotPermissionTo(function)) {
final String authorizationMessage = "User has no authority to: " + function;
log.info("Unauthorized access: userId: {} action: {} allowed: {}", getId(), LogParameterEscapeUtil.escapeLogParameter(function),
getAuthorities());
throw new NoAuthorizationException(authorizationMessage);
}
}
fineract-provider/src/main/java/org/apache/fineract/useradministration/service/PermissionReadPlatformServiceImpl.java
+3 -3
View File
@@ -55,7 +55,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform
final PermissionUsageDataMapper mapper = new PermissionUsageDataMapper(sqlGenerator);
final String sql = mapper.permissionSchema();
LOG.info("retrieveAllPermissions: {}", sql);
LOG.debug("retrieveAllPermissions: {}", sql);
return this.jdbcTemplate.query(sql, mapper, new Object[] {});
}
@@ -66,7 +66,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform
final PermissionUsageDataMapper mapper = new PermissionUsageDataMapper(sqlGenerator);
final String sql = mapper.makerCheckerablePermissionSchema();
LOG.info("retrieveAllMakerCheckerablePermissions: {}", sql);
LOG.debug("retrieveAllMakerCheckerablePermissions: {}", sql);
return this.jdbcTemplate.query(sql, mapper, new Object[] {});
}
@@ -76,7 +76,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform
final PermissionUsageDataMapper mapper = new PermissionUsageDataMapper(sqlGenerator);
final String sql = mapper.rolePermissionSchema();
LOG.info("retrieveAllRolePermissions: {}", sql);
LOG.debug("retrieveAllRolePermissions: {}", sql);
return this.jdbcTemplate.query(sql, mapper, new Object[] { roleId });
}