Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 api-2.2/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>initializer</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>initializer-api-2.2</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion api-2.3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>initializer</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>initializer-api-2.3</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion api-2.4/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>initializer</artifactId>
<groupId>org.openmrs.module</groupId>
<version>2.12.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion api-2.5/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>initializer</artifactId>
<groupId>org.openmrs.module</groupId>
<version>2.12.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,7 @@ private void sqlUpdate(String sql) {
Context.getAdministrationService().executeSQL(sql, false);
}

@Override
public ConfigDirUtil getDirUtil() {
return new ConfigDirUtil(iniz.getConfigDirPath(), iniz.getChecksumsDirPath(), getDomainName(), true);
return new ConfigDirUtil(iniz.getConfigDirPath(), getDomainName(), true);
}
}
2 changes: 1 addition & 1 deletion api-2.7/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>initializer</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion api-bahmni/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>initializer</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>initializer-api-bahmni</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.openmrs.module</groupId>
<artifactId>initializer</artifactId>
<version>2.12.0-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<artifactId>initializer-api</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
*/
package org.openmrs.module.initializer;

import static org.openmrs.module.initializer.InitializerConstants.MODULE_ARTIFACT_ID;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_LOGGING_ENABLED;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_LOGGING_LEVEL;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_LOGGING_LOCATION;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_STARTUP_LOAD_DISABLED;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_STARTUP_LOAD_FAIL_ON_ERROR;
import static org.openmrs.module.initializer.api.utils.Utils.getPropertyValue;

import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
Expand All @@ -24,14 +32,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import static org.openmrs.module.initializer.InitializerConstants.MODULE_ARTIFACT_ID;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_LOGGING_ENABLED;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_LOGGING_LEVEL;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_LOGGING_LOCATION;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_STARTUP_LOAD_DISABLED;
import static org.openmrs.module.initializer.InitializerConstants.PROPS_STARTUP_LOAD_FAIL_ON_ERROR;
import static org.openmrs.module.initializer.api.utils.Utils.getPropertyValue;

/**
* This class contains the logic that is run every time this module is either started or shutdown
*/
Expand Down Expand Up @@ -76,23 +76,27 @@ public void started() {
InitializerMessageSource messageSource = getInitializerMessageSource();
Context.getMessageSourceService().setActiveMessageSource(messageSource);

String startupLoadingMode = getInitializerService().getInitializerConfig().getStartupLoadingMode();
getInitializerService().migrateChecksumsFromFilesToDB();

String startupLoadingMode = getInitializerConfig().getStartupLoadingMode();
if (PROPS_STARTUP_LOAD_DISABLED.equalsIgnoreCase(startupLoadingMode)) {
log.info("OpenMRS config loading process disabled at initializer startup");
} else {
boolean throwError = PROPS_STARTUP_LOAD_FAIL_ON_ERROR.equalsIgnoreCase(startupLoadingMode);
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I indicated above, we should continue to load this throwError property here, and pass it in

log.info("OpenMRS config loading process started...");

try {
getInitializerService().loadUnsafe(true, throwError);
log.info("OpenMRS config loading process completed.");
Comment thread
mseaton marked this conversation as resolved.
}
catch (Exception e) {
throw new ModuleException("An error occurred loading initializer configuration", e);
}
}
}

protected InitializerConfig getInitializerConfig() {
return getInitializerService().getInitializerConfig();
}

protected InitializerService getInitializerService() {
return Context.getService(InitializerService.class);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public synchronized void refreshCache() {
protected Map<String, Properties> getMessagePropertyResourcesFromFilesystem() {
List<OrderedPropertiesFile> messagePropertyFiles = new ArrayList<>();
for (String domain : getDomainsToScan()) {
ConfigDirUtil dirUtil = new ConfigDirUtil(iniz.getConfigDirPath(), iniz.getChecksumsDirPath(), domain, true);
ConfigDirUtil dirUtil = new ConfigDirUtil(iniz.getConfigDirPath(), domain, true);
List<File> propFiles = dirUtil.getFiles(PROPERTIES_EXTENSION);
for (File file : propFiles) {
messagePropertyFiles.add(new OrderedPropertiesFile(file));
Expand Down
Loading
Loading