diff --git a/core/sunbird-es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java b/core/sunbird-es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java index 2ee3b594..1dee535f 100644 --- a/core/sunbird-es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java +++ b/core/sunbird-es-utils/src/main/java/org/sunbird/common/ElasticSearchRestHighImpl.java @@ -59,6 +59,8 @@ public class ElasticSearchRestHighImpl implements ElasticSearchService { private static final String ERROR = "ERROR"; private static final LoggerUtil logger = new LoggerUtil(ElasticSearchRestHighImpl.class); + private static final int MAX_ES_RESULT_SIZE = 10000; + private static final int DEFAULT_ES_RESULT_SIZE = 200; /** @@ -75,7 +77,7 @@ public Future save(String index, String identifier, Map long startTime = System.currentTimeMillis(); Promise promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:save: method started at ==" + startTime + " for Index " + index); + logger.debug(requestContext, "ElasticSearchRestHighImpl:save: method started at =={} for Index {}", startTime, index); if (StringUtils.isBlank(identifier) || StringUtils.isBlank(index)) { logger.info(requestContext, "ElasticSearchRestHighImpl:save: Identifier or Index value is null or empty, identifier : " @@ -92,14 +94,14 @@ public Future save(String index, String identifier, Map ActionListener listener = new ActionListener() { @Override public void onResponse(IndexResponse indexResponse) { - logger.info(requestContext, "ElasticSearchRestHighImpl:save: Success for index : " + index + ", identifier :" + identifier); + logger.info(requestContext, "ElasticSearchRestHighImpl:save: Success for index : {}, identifier :{}", index, identifier); promise.success(indexResponse.getId()); logEndTime(startTime, index, requestContext); } @Override public void onFailure(Exception e) { - logger.error(requestContext, "ElasticSearchRestHighImpl:save: Error while saving " + index + " id : " + identifier, e); + logger.error(requestContext, "ElasticSearchRestHighImpl:save: Error while saving {} id : {}", index, identifier, e); promise.failure(e); logEndTime(startTime, index, requestContext); } @@ -131,11 +133,11 @@ public Future update(String index, String identifier, Map promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:update: method started at ==" + startTime + " for Index " + index); + logger.debug(requestContext, "ElasticSearchRestHighImpl:update: method started at =={} for Index {}", startTime, index); if (StringUtils.isBlank(index) || StringUtils.isBlank(identifier) || data == null) { - logger.info(requestContext, "ElasticSearchRestHighImpl:update: Invalid parameters - index: " + index - + ", identifier: " + identifier + ", data: " + (data == null ? "null" : "present")); + logger.info(requestContext, "ElasticSearchRestHighImpl:update: Invalid parameters - index: {}, identifier: {}, data: {}", + index, identifier, (data == null ? "null" : "present")); promise.failure(ProjectUtil.createClientException(ResponseCode.invalidData)); return promise.future(); } @@ -147,8 +149,7 @@ public Future update(String index, String identifier, Map listener = new ActionListener() { @Override public void onResponse(UpdateResponse updateResponse) { - logger.info(requestContext, "ElasticSearchRestHighImpl:update: Success with " + updateResponse.getResult() - + " response from Elasticsearch for index: " + index + ", identifier: " + identifier); + logger.info(requestContext, "ElasticSearchRestHighImpl:update: Success with {} response from Elasticsearch for index: {}, identifier: {}", updateResponse.getResult(), index, identifier); promise.success(true); logUpdateEndTime(startTime, index, requestContext); } @@ -187,12 +188,11 @@ public Future> getDataByIdentifier(String index, String iden long startTime = System.currentTimeMillis(); Promise> promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:getDataByIdentifier: method started at ==" + startTime - + " for Index " + index); + logger.debug(requestContext, "ElasticSearchRestHighImpl:getDataByIdentifier: method started at =={} for Index {}", startTime, index); if (StringUtils.isBlank(index) || StringUtils.isBlank(identifier)) { - logger.info(requestContext, "ElasticSearchRestHighImpl:getDataByIdentifier: Invalid parameters - index: " - + index + ", identifier: " + identifier); + logger.info(requestContext, "ElasticSearchRestHighImpl:getDataByIdentifier: Invalid parameters - index: {}, identifier: {}", + index, identifier); promise.failure(ProjectUtil.createClientException(ResponseCode.invalidData)); return promise.future(); } @@ -256,7 +256,7 @@ public Future delete(String index, String identifier, RequestContext re long startTime = System.currentTimeMillis(); Promise promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:delete: method started at ==" + startTime); + logger.debug(requestContext, "ElasticSearchRestHighImpl:delete: method started at =={}", startTime); if (StringUtils.isBlank(index) || StringUtils.isBlank(identifier)) { logger.info(requestContext, "ElasticSearchRestHighImpl:delete: Invalid parameters - index: " @@ -319,7 +319,7 @@ public Future> search(SearchDTO searchDTO, String index, Req long startTime = System.currentTimeMillis(); Promise> promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:search: method started at ==" + startTime); + logger.debug(requestContext, "ElasticSearchRestHighImpl:search: method started at =={}", startTime); try { SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -378,10 +378,10 @@ public Future> search(SearchDTO searchDTO, String index, Req searchSourceBuilder.from(searchDTO.getOffset()); } - // Set limit - if (searchDTO.getLimit() != null) { - searchSourceBuilder.size(searchDTO.getLimit()); - } + // Set limit with bounds checking + int requestedSize = (searchDTO.getLimit() != null && searchDTO.getLimit() > 0) + ? searchDTO.getLimit() : DEFAULT_ES_RESULT_SIZE; + searchSourceBuilder.size(Math.min(requestedSize, MAX_ES_RESULT_SIZE)); // Apply additional properties if (searchDTO.getAdditionalProperties() != null && !searchDTO.getAdditionalProperties().isEmpty()) { @@ -405,7 +405,7 @@ public Future> search(SearchDTO searchDTO, String index, Req searchSourceBuilder = addAggregations(searchSourceBuilder, searchDTO.getFacets(), requestContext); } - logger.info(requestContext, "ElasticSearchRestHighImpl:search: calling search for index " + index + logger.info(requestContext, "ElasticSearchRestHighImpl:search: calling search for index {} + ", with query = " + searchSourceBuilder.toString()); searchRequest.source(searchSourceBuilder); @@ -429,7 +429,7 @@ public void onResponse(SearchResponse response) { @Override public void onFailure(Exception e) { - logger.error(requestContext, "ElasticSearchRestHighImpl:search: Search failed for index: " + index, e); + logger.error(requestContext, "ElasticSearchRestHighImpl:search: Search failed for index: {}", index, e); promise.failure(e); logSearchEndTime(startTime, index, requestContext); } @@ -438,7 +438,7 @@ public void onFailure(Exception e) { ConnectionManager.getRestClient().searchAsync(searchRequest, RequestOptions.DEFAULT, listener); } catch (Exception e) { - logger.error(requestContext, "ElasticSearchRestHighImpl:search: Failed to prepare/submit search request for index: " + index, e); + logger.error(requestContext, "ElasticSearchRestHighImpl:search: Failed to prepare/submit search request for index: {}", index, e); promise.failure(e); logSearchEndTime(startTime, index, requestContext); } @@ -464,7 +464,7 @@ public Future healthCheck() { @Override public void onResponse(Boolean getResponse) { promise.success(getResponse != null ? getResponse : false); - logger.info("ElasticSearchRestHighImpl:healthCheck: Health check successful, index exists: " + getResponse); + logger.info("ElasticSearchRestHighImpl:healthCheck: Health check successful, index exists: {}", getResponse); } @Override @@ -497,11 +497,11 @@ public Future bulkInsert(String index, List> dataLi long startTime = System.currentTimeMillis(); Promise promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:bulkInsert: method started at ==" + startTime + " for Index " + index); + logger.debug(requestContext, "ElasticSearchRestHighImpl:bulkInsert: method started at =={} for Index {}", startTime, index); if (StringUtils.isBlank(index) || dataList == null || dataList.isEmpty()) { - logger.info(requestContext, "ElasticSearchRestHighImpl:bulkInsert: Invalid parameters - index: " + index - + ", dataList size: " + (dataList == null ? "null" : dataList.size())); + logger.info(requestContext, "ElasticSearchRestHighImpl:bulkInsert: Invalid parameters - index: {}, dataList size: {}", + index, (dataList == null ? "null" : dataList.size())); promise.failure(ProjectUtil.createClientException(ResponseCode.invalidData)); return promise.future(); } @@ -545,7 +545,7 @@ public void onResponse(BulkResponse bulkResponse) { @Override public void onFailure(Exception e) { - logger.error(requestContext, "ElasticSearchRestHighImpl:bulkInsert: Bulk upload failed for index: " + index, e); + logger.error(requestContext, "ElasticSearchRestHighImpl:bulkInsert: Bulk upload failed for index: {}", index, e); promise.success(false); logBulkInsertEndTime(startTime, index, requestContext); } @@ -554,7 +554,7 @@ public void onFailure(Exception e) { ConnectionManager.getRestClient().bulkAsync(request, RequestOptions.DEFAULT, listener); } catch (Exception e) { - logger.error(requestContext, "ElasticSearchRestHighImpl:bulkInsert: Failed to prepare/submit bulk request for index: " + index, e); + logger.error(requestContext, "ElasticSearchRestHighImpl:bulkInsert: Failed to prepare/submit bulk request for index: {}", index, e); promise.success(false); logBulkInsertEndTime(startTime, index, requestContext); } @@ -575,7 +575,7 @@ private static SearchSourceBuilder addAggregations(SearchSourceBuilder searchSou List> facets, RequestContext requestContext) { long startTime = System.currentTimeMillis(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:addAggregations: method started at ==" + startTime); + logger.debug(requestContext, "ElasticSearchRestHighImpl:addAggregations: method started at =={}", startTime); if (CollectionUtils.isNotEmpty(facets)) { Map map = facets.get(0); @@ -614,11 +614,11 @@ public Future upsert(String index, String identifier, Map promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:upsert: method started at ==" + startTime + " for Index " + index); + logger.debug(requestContext, "ElasticSearchRestHighImpl:upsert: method started at =={} for Index {}", startTime, index); if (StringUtils.isBlank(index) || StringUtils.isBlank(identifier) || data == null || data.isEmpty()) { - logger.info(requestContext, "ElasticSearchRestHighImpl:upsert: Invalid parameters - index: " + index - + ", identifier: " + identifier + ", data: " + (data == null ? "null" : "size=" + data.size())); + logger.info(requestContext, "ElasticSearchRestHighImpl:upsert: Invalid parameters - index: {}, identifier: {}, data: {}", + index, identifier, (data == null ? "null" : "size=" + data.size())); promise.failure(ProjectUtil.createClientException(ResponseCode.invalidData)); return promise.future(); } @@ -672,7 +672,7 @@ public Future>> getEsResultByListOfIds(List>> promise = Futures.promise(); - logger.debug(requestContext, "ElasticSearchRestHighImpl:getEsResultByListOfIds: method started for index " + index); + logger.debug(requestContext, "ElasticSearchRestHighImpl:getEsResultByListOfIds: method started for index {}", index); if (ids == null || ids.isEmpty() || StringUtils.isBlank(index)) { logger.info(requestContext, "ElasticSearchRestHighImpl:getEsResultByListOfIds: Invalid parameters - index: " + index @@ -704,11 +704,11 @@ public Future>> getEsResultByListOfIds(List()); - logger.info(requestContext, "ElasticSearchRestHighImpl:getEsResultByListOfIds: No documents found for index " + index); + logger.info(requestContext, "ElasticSearchRestHighImpl:getEsResultByListOfIds: No documents found for index {}", index); } } catch (Exception e) { - logger.error(requestContext, "ElasticSearchRestHighImpl:getEsResultByListOfIds: Failed to retrieve documents for index: " + index, e); + logger.error(requestContext, "ElasticSearchRestHighImpl:getEsResultByListOfIds: Failed to retrieve documents for index: {}", index, e); promise.success(new HashMap<>()); } diff --git a/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/systemsettings/impl/SystemSettingClientImpl.java b/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/systemsettings/impl/SystemSettingClientImpl.java index be0015b0..f7c4db55 100644 --- a/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/systemsettings/impl/SystemSettingClientImpl.java +++ b/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/systemsettings/impl/SystemSettingClientImpl.java @@ -6,6 +6,8 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sunbird.actorutil.InterServiceCommunication; import org.sunbird.actorutil.InterServiceCommunicationFactory; import org.sunbird.actorutil.systemsettings.SystemSettingClient; @@ -13,13 +15,12 @@ import org.sunbird.response.Response; import org.sunbird.operations.lms.ActorOperations; import org.sunbird.keys.JsonKey; -import org.sunbird.logging.LoggerEnum; -import org.sunbird.logging.ProjectLogger; import org.sunbird.request.Request; import org.sunbird.response.ResponseCode; import org.sunbird.models.systemsetting.SystemSetting; public class SystemSettingClientImpl implements SystemSettingClient { + private static final Logger logger = LoggerFactory.getLogger(SystemSettingClientImpl.class); private static InterServiceCommunication interServiceCommunication = InterServiceCommunicationFactory.getInstance(); @@ -33,7 +34,7 @@ public static SystemSettingClient getInstance() { @Override public SystemSetting getSystemSettingByField(ActorRef actorRef, String field) { - ProjectLogger.log("SystemSettingClientImpl:getSystemSettingByField: field is " + field, LoggerEnum.INFO.name()); + logger.info("SystemSettingClientImpl:getSystemSettingByField: field is {}", field); SystemSetting systemSetting = getSystemSetting(actorRef, JsonKey.FIELD, field); return systemSetting; } @@ -53,17 +54,15 @@ public T getSystemSettingByFieldAndKey( } return (T)objectMapper.convertValue(valueMap.get(keys[numKeys - 1]), typeReference); } catch (Exception e) { - ProjectLogger.log( - "SystemSettingClientImpl:getSystemSettingByFieldAndKey: Exception occurred with error message = " - + e.getMessage(), - LoggerEnum.ERROR.name()); + logger.error("SystemSettingClientImpl:getSystemSettingByFieldAndKey: Exception occurred with error message = {}", + e.getMessage(), e); } } return null; } private SystemSetting getSystemSetting(ActorRef actorRef, String param, Object value) { - ProjectLogger.log("SystemSettingClientImpl: getSystemSetting called", LoggerEnum.DEBUG); + logger.debug("SystemSettingClientImpl: getSystemSetting called"); Request request = new Request(); Map map = new HashMap<>(); map.put(param, value); diff --git a/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/user/impl/UserClientImpl.java b/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/user/impl/UserClientImpl.java index 2999eb62..f5582cdc 100644 --- a/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/user/impl/UserClientImpl.java +++ b/modules/lms/course-mw/actor-util/src/main/java/org/sunbird/actorutil/user/impl/UserClientImpl.java @@ -10,14 +10,14 @@ import org.sunbird.common.factory.EsClientFactory; import org.sunbird.common.inf.ElasticSearchService; import org.sunbird.response.Response; -import org.sunbird.logging.ProjectLogger; -import org.sunbird.logging.LoggerEnum; import org.sunbird.keys.JsonKey; import org.sunbird.common.ProjectUtil; import org.sunbird.operations.lms.ActorOperations; import org.sunbird.request.Request; import org.sunbird.response.ResponseCode; import org.sunbird.dto.SearchDTO; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import scala.concurrent.Future; import java.text.MessageFormat; @@ -28,18 +28,19 @@ public class UserClientImpl implements UserClient { + private static final Logger logger = LoggerFactory.getLogger(UserClientImpl.class); private static InterServiceCommunication interServiceCommunication = InterServiceCommunicationFactory.getInstance(); private ElasticSearchService esUtil = EsClientFactory.getInstance(); @Override public String createUser(ActorRef actorRef, Map userMap) { - ProjectLogger.log("UserClientImpl: createUser called", LoggerEnum.INFO); + logger.info("UserClientImpl: createUser called"); return upsertUser(actorRef, userMap, ActorOperations.CREATE_USER.getValue()); } @Override public void updateUser(ActorRef actorRef, Map userMap) { - ProjectLogger.log("UserClientImpl: updateUser called", LoggerEnum.INFO); + logger.info("UserClientImpl: updateUser called"); upsertUser(actorRef, userMap, ActorOperations.UPDATE_USER.getValue()); } diff --git a/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/actors/cache/CacheManagementActor.java b/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/actors/cache/CacheManagementActor.java index ce569355..eedbe0c6 100644 --- a/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/actors/cache/CacheManagementActor.java +++ b/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/actors/cache/CacheManagementActor.java @@ -8,7 +8,6 @@ import org.sunbird.keys.JsonKey; import org.sunbird.logging.LoggerEnum; import org.sunbird.logging.LoggerUtil; -import org.sunbird.logging.ProjectLogger; import org.sunbird.request.Request; import org.sunbird.response.ResponseCode; @@ -17,8 +16,8 @@ public class CacheManagementActor extends BaseActor { @Override public void onReceive(Request request) throws Throwable { - System.out.println( - "Actor dispatcher parent=>" + getContext().getParent().path() + ", self=>" + self().path()); + logger.debug(request.getRequestContext(), "Actor dispatcher parent=>{}, self=>{}", + getContext().getParent().path(), self().path()); if (request.getOperation().equalsIgnoreCase(ActorOperations.CLEAR_CACHE.getValue())) { clearCache(request); } else { @@ -28,7 +27,7 @@ public void onReceive(Request request) throws Throwable { private void clearCache(Request request) { String mapName = (String) request.getContext().get(JsonKey.MAP_NAME); - logger.info(request.getRequestContext(), "CacheManagementActor:clearCache: mapName = " + mapName); + logger.info(request.getRequestContext(), "CacheManagementActor:clearCache: mapName = {}", mapName); try { if (!JsonKey.ALL.equals(mapName)) { cache.clear(mapName); @@ -41,8 +40,8 @@ private void clearCache(Request request) { sender().tell(response, self()); } catch (Exception e) { - logger.error(request.getRequestContext(), "CacheManagementActor:clearCache: Error occurred for mapName = " - + mapName + " error = " + e.getMessage(), e); + logger.error(request.getRequestContext(), "CacheManagementActor:clearCache: Error occurred for mapName = {} error = {}", + mapName, e.getMessage(), e); sender().tell(e, self()); } } diff --git a/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/util/SearchTelemetryUtil.java b/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/util/SearchTelemetryUtil.java index 224768ac..efbdf0cc 100644 --- a/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/util/SearchTelemetryUtil.java +++ b/modules/lms/course-mw/course-actors-common/src/main/java/org/sunbird/learner/util/SearchTelemetryUtil.java @@ -4,8 +4,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sunbird.keys.JsonKey; -import org.sunbird.logging.ProjectLogger; import org.sunbird.common.PropertiesCache; import org.sunbird.request.Request; import org.sunbird.dto.SearchDTO; @@ -13,6 +14,8 @@ import org.sunbird.telemetry.util.TelemetryWriter; public class SearchTelemetryUtil { + private static final Logger logger = LoggerFactory.getLogger(SearchTelemetryUtil.class); + private SearchTelemetryUtil() {} public static void generateSearchTelemetryEvent( @@ -30,7 +33,7 @@ public static void generateSearchTelemetryEvent( request.setRequest(telemetryRequestForSearch(context, params)); TelemetryWriter.write(request); } catch (Exception e) { - ProjectLogger.log(e.getMessage(), e); + logger.error("Error in generateSearchTelemetryEvent", e); } } diff --git a/modules/lms/service/app/controllers/collectionsummaryaggregate/CollectionSummaryAggregateController.java b/modules/lms/service/app/controllers/collectionsummaryaggregate/CollectionSummaryAggregateController.java index ae64e282..13d95b15 100644 --- a/modules/lms/service/app/controllers/collectionsummaryaggregate/CollectionSummaryAggregateController.java +++ b/modules/lms/service/app/controllers/collectionsummaryaggregate/CollectionSummaryAggregateController.java @@ -5,6 +5,8 @@ import controllers.collectionsummaryaggregate.validator.Validator; import org.sunbird.operations.lms.ActorOperations; import org.sunbird.request.Request; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import play.mvc.Http; import play.mvc.Result; @@ -13,6 +15,7 @@ import java.util.concurrent.CompletionStage; public class CollectionSummaryAggregateController extends BaseController { + private static final Logger logger = LoggerFactory.getLogger(CollectionSummaryAggregateController.class); @Inject @Named("collection-summary-aggregate-actor") @@ -25,7 +28,7 @@ public CompletionStage getCollectionSummaryAggregate(Http.Request httpRe httpRequest.body().asJson(), (req) -> { Request request = (Request) req; - System.out.println("Validation Request Obj" + request); + logger.debug("Validation Request Obj {}", request); new Validator().validate(request); return null; }, diff --git a/modules/lms/service/app/modules/ActorStartModule.java b/modules/lms/service/app/modules/ActorStartModule.java index dc022bf5..3004d0b8 100644 --- a/modules/lms/service/app/modules/ActorStartModule.java +++ b/modules/lms/service/app/modules/ActorStartModule.java @@ -3,14 +3,17 @@ import org.apache.pekko.routing.FromConfig; import org.apache.pekko.routing.RouterConfig; import com.google.inject.AbstractModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import play.libs.pekko.PekkoGuiceSupport; import util.ACTOR_NAMES; public class ActorStartModule extends AbstractModule implements PekkoGuiceSupport { + private static final Logger logger = LoggerFactory.getLogger(ActorStartModule.class); @Override protected void configure() { - System.out.println("binding actors for dependency injection"); + logger.info("binding actors for dependency injection"); final RouterConfig config = new FromConfig(); for (ACTOR_NAMES actor : ACTOR_NAMES.values()) { bindActor( @@ -20,6 +23,6 @@ protected void configure() { return props.withRouter(config); }); } - System.out.println("binding completed"); + logger.info("binding completed"); } } diff --git a/modules/lms/service/app/modules/ApplicationStart.java b/modules/lms/service/app/modules/ApplicationStart.java index 5e998ee1..4c9eed69 100644 --- a/modules/lms/service/app/modules/ApplicationStart.java +++ b/modules/lms/service/app/modules/ApplicationStart.java @@ -7,6 +7,8 @@ import org.sunbird.learner.util.ContentSearchMock; import org.sunbird.learner.util.SchedulerManager; import org.sunbird.learner.util.Util; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import play.api.Environment; import play.api.inject.ApplicationLifecycle; @@ -26,6 +28,7 @@ public class ApplicationStart { public static ProjectUtil.Environment env; public static String ssoPublicKey = ""; public LoggerUtil logger = new LoggerUtil(this.getClass()); + private static final Logger slf4jLogger = LoggerFactory.getLogger(ApplicationStart.class); /** * All one time initialization which required during server startup will fall here. @@ -35,7 +38,7 @@ public class ApplicationStart { */ @Inject public ApplicationStart(ApplicationLifecycle lifecycle, Environment environment) { - System.out.println("ApplicationStart:ApplicationStart: Start"); + slf4jLogger.info("ApplicationStart:ApplicationStart: Start"); setEnvironment(environment); ssoPublicKey = System.getenv(JsonKey.SSO_PUBLIC_KEY); logger.info("Server started.. with environment: " + env.name()); @@ -48,18 +51,18 @@ public ApplicationStart(ApplicationLifecycle lifecycle, Environment environment) () -> { return CompletableFuture.completedFuture(null); }); - System.out.println("keymanger.init():starts"); + slf4jLogger.info("keymanger.init():starts"); KeyManager.init(); - System.out.println("ApplicationStart:ApplicationStart: End"); + slf4jLogger.info("ApplicationStart:ApplicationStart: End"); } public static void mockServiceSetup() { LoggerUtil logger = new LoggerUtil(ApplicationStart.class); - try { - ContentSearchMock.setup(); - } catch (Exception e) { - logger.info((org.sunbird.request.RequestContext) null,"Error setting up ContentSearchMock:"+e); - } + try { + ContentSearchMock.setup(); + } catch (Exception e) { + logger.info((org.sunbird.request.RequestContext) null, "Error setting up ContentSearchMock: {}", e.getMessage(), e); + } } private void checkCassandraConnections() { diff --git a/modules/lms/service/app/modules/StartModule.java b/modules/lms/service/app/modules/StartModule.java index 98205329..266bb47e 100644 --- a/modules/lms/service/app/modules/StartModule.java +++ b/modules/lms/service/app/modules/StartModule.java @@ -1,6 +1,8 @@ package modules; import com.google.inject.AbstractModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.sunbird.cache.util.RedisCacheUtil; /** @@ -10,9 +12,11 @@ * @author Jaikumar Soundara Rajan */ public class StartModule extends AbstractModule { + private static final Logger logger = LoggerFactory.getLogger(StartModule.class); + @Override protected void configure() { - System.out.println("StartModule:configure: Start"); + logger.info("StartModule:configure: Start"); try { bind(ApplicationStart.class).asEagerSingleton(); bind(RedisCacheUtil.class).asEagerSingleton(); @@ -20,7 +24,7 @@ protected void configure() { e.printStackTrace(); throw e; } - System.out.println("StartModule:configure: End"); + logger.info("StartModule:configure: End"); } } diff --git a/modules/userorg/controller/app/util/RequestInterceptor.java b/modules/userorg/controller/app/util/RequestInterceptor.java index 54ac64bb..a886962c 100644 --- a/modules/userorg/controller/app/util/RequestInterceptor.java +++ b/modules/userorg/controller/app/util/RequestInterceptor.java @@ -121,7 +121,7 @@ private static String getUserRequestedFor(Http.Request request) { } } } catch (Exception e) { - logger.error("Likely a possibility? " + request.uri(), e); + logger.error("Likely a possibility? {}", request.uri(), e); } return requestedForUserID; } @@ -170,7 +170,7 @@ public static Map verifyRequestData(Http.Request request, Map re userAuthentication.put(JsonKey.USER_ID, clientId); userAuthentication.put(JsonKey.MANAGED_FOR, managedForId); } else { - logger.info("Token not present in request: " + request.getHeaders().toMap()); + logger.info("Token not present in request: {}", request.getHeaders().toMap()); } } else { if (accessToken.isPresent()) {