Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mosip 29287 fix to logger configuration enabled cloud config #84

Merged
merged 6 commits into from
Oct 13, 2023
Merged

Mosip 29287 fix to logger configuration enabled cloud config #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4f125a0
[MOSIP-29207] Updated workflows as per reusable workflows templates (…
syedsalman3753 Sep 26, 2023
fcbeef5
MOSIP-29095 (#83)
loganathan-sekaran Oct 5, 2023
7231bef
Fix to logger config; Enabled cloud config
Oct 12, 2023
6960f5d
Added debug logging for biosdk provider impl
Oct 12, 2023
0330dba
Removed unwanted logging property
Oct 13, 2023
a10a6fb
Merge remote-tracking branch 'upstream/release-1.2.0.1' into MOSIP-29…
Oct 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion biosdk-services/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ EXPOSE 9099
ENTRYPOINT [ "./configure_biosdk.sh" ]

CMD echo $biosdk_bioapi_impl ; \
java -Dloader.path="${loader_path_env}" -Dbiosdk_bioapi_impl="${biosdk_bioapi_impl}" -Dserver.servlet.context-path="${service_context_env}" -Dlogging.level.root=${logging_level_root_env} -jar -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" biosdk-services.jar
java -Dloader.path="${loader_path_env}" -Dspring.cloud.config.label="${spring_config_label_env}" -Dspring.profiles.active="${active_profile_env}" -Dspring.cloud.config.uri="${spring_config_url_env}" -jar biosdk-services.jar
loganathan-sekaran marked this conversation as resolved.
Show resolved Hide resolved
19 changes: 1 addition & 18 deletions biosdk-services/src/main/java/io/mosip/biosdk/services/config/LoggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package io.mosip.biosdk.services.config;

import io.mosip.kernel.core.logger.spi.Logger;
import io.mosip.kernel.logger.logback.appender.RollingFileAppender;
import io.mosip.kernel.logger.logback.factory.Logfactory;

public final class LoggerConfig {
Expand All @@ -13,24 +12,8 @@ private LoggerConfig() {

}


/** The mosip rolling file appender. */
private final static RollingFileAppender MOSIP_ROLLING_APPENDER = new RollingFileAppender();

static {
MOSIP_ROLLING_APPENDER.setAppend(true);
MOSIP_ROLLING_APPENDER.setAppenderName("org.apache.log4j.RollingFileAppender");
MOSIP_ROLLING_APPENDER.setFileName("./logs/biosdk-service.log");
MOSIP_ROLLING_APPENDER.setFileNamePattern("./logs/biosdk-service-%d{yyyy-MM-dd}-%i.log");
MOSIP_ROLLING_APPENDER.setImmediateFlush(true);
MOSIP_ROLLING_APPENDER.setMaxFileSize("50mb");
// mosipRollingFileAppender.setMaxHistory(3);
MOSIP_ROLLING_APPENDER.setPrudent(false);
// mosipRollingFileAppender.setTotalCap("50mb");
}

public static Logger logConfig(Class<?> clazz) {
return Logfactory.getDefaultRollingFileLogger(MOSIP_ROLLING_APPENDER, clazz);
return Logfactory.getSlf4jLogger(clazz);
loganathan-sekaran marked this conversation as resolved.
Show resolved Hide resolved
}

loganathan-sekaran marked this conversation as resolved.
Show resolved Hide resolved
}
8 changes: 5 additions & 3 deletions biosdk-services/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
server.port=9099
spring.cloud.config.enabled=false
spring.cloud.config.enabled=true
security.basic.enabled=false
server.servlet.context-path=/biosdk-service
biosdk_class=io.mosip.mock.sdk.impl.SampleSDK
biosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2
#logging.level.org.springframework=DEBUG
spring.application.name=biosdk-service
spring.cloud.config.name=application,biosdk-service
spring.profiles.active=default
spring.cloud.config.label=master


## Tomcat access logs
Expand All @@ -28,4 +30,4 @@ management.endpoint.metrics.enabled=true
management.endpoint.prometheus.enabled=true
management.metrics.export.prometheus.enabled=true

mosip.biosdk.log-request-response-enabled=true
logging.level.root=INFO
5 changes: 2 additions & 3 deletions biosdk-services/src/main/resources/bootstrap.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ spring.cloud.config.uri=http://localhost:51000/config
spring.cloud.config.label=master
spring.profiles.active=default
spring.application.name=biosdk-service
spring.cloud.config.name=biosdk-service
spring.cloud.config.name=application,biosdk-service
server.port=9099
security.basic.enabled=false
server.servlet.context-path=/biosdk-service
Expand All @@ -12,7 +12,7 @@ server.servlet.context-path=/biosdk-service
health.config.enabled=false
management.security.enable=false
management.endpoint.health.show-details=always
management.endpoints.web.exposure.include=info,health,refresh,mappings
management.endpoints.web.exposure.include=info,health,refresh,mappings,env
management.endpoint.metrics.enabled=true
management.endpoint.prometheus.enabled=true
management.metrics.export.prometheus.enabled=true
Expand All @@ -21,7 +21,6 @@ management.metrics.export.prometheus.enabled=true

#iam mock-sdk config
sdk_check_iso_timestamp_format=true
biosdk_class=io.mosip.mock.sdk.impl.SampleSDKV2
mosip.role.biosdk.getservicestatus=REGISTRATION_PROCESSOR
biosdk_bioapi_impl=io.mosip.mock.sdk.impl.SampleSDKV2

Expand Down