honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use SystemOutLoggingService for logging

This commit is contained in:
dotasek 2022-03-24 17:33:27 -04:00
parent 25d9439fa9
commit 35f5b96eb7
4 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
View File

@ -126,6 +126,8 @@ import org.hl7.fhir.utilities.validation.ValidationOptions.ValueSetMode;
import com.google.gson.JsonObject;
import javax.annotation.Nonnull;
public abstract class BaseWorkerContext extends I18nBase implements IWorkerContext{
public class ResourceProxy {
@ -230,7 +232,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
private boolean canRunWithoutTerminology;
protected boolean noTerminologyServer;
private int expandCodesLimit = 1000;
protected ILoggingService logger;
protected ILoggingService logger = new SystemOutLoggingService();
protected Parameters expParameters;
private TranslationServices translator = new NullTranslator();
@ -240,7 +242,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
private boolean tlogging = true;
private ICanonicalResourceLocator locator;
protected String userAgent;
protected BaseWorkerContext() throws FileNotFoundException, IOException, FHIRException {
setValidationMessageLanguage(getLocale());
clock = new TimeTracker();
@ -384,7 +386,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
if ((packageInfo == null || !packageInfo.isExamplesPackage()) || !map.containsKey(r.getId())) {
map.put(r.getId(), new ResourceProxy(r));
} else {
logDebugMessage(LogCategory.PROGRESS,"Ignore "+r.fhirType()+"/"+r.getId()+" from package "+packageInfo.toString());
logger.logDebugMessage(LogCategory.PROGRESS,"Ignore "+r.fhirType()+"/"+r.getId()+" from package "+packageInfo.toString());
}
if (r instanceof CodeSystem || r instanceof NamingSystem) {
@ -593,19 +595,19 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
}
if (txcaps == null) {
try {
log("Terminology server: Check for supported code systems for "+system);
logger.logMessage("Terminology server: Check for supported code systems for "+system);
final TerminologyCapabilities capabilityStatement = txCache.hasTerminologyCapabilities() ? txCache.getTerminologyCapabilities() : txClient.getTerminologyCapabilities();
txCache.cacheTerminologyCapabilities(capabilityStatement);
setTxCaps(capabilityStatement);
} catch (Exception e) {
if (canRunWithoutTerminology) {
noTerminologyServer = true;
log("==============!! Running without terminology server !! ==============");
logger.logMessage("==============!! Running without terminology server !! ==============");
if (txClient!=null) {
log("txServer = "+txClient.getAddress());
log("Error = "+e.getMessage()+"");
logger.logMessage("txServer = "+txClient.getAddress());
logger.logMessage("Error = "+e.getMessage()+"");
}
log("=====================================================================");
logger.logMessage("=====================================================================");
return false;
} else {
e.printStackTrace();
@ -621,29 +623,13 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
}
}
private void log(String message) {
if (logger != null) {
logger.logMessage(message);
} else {
System.out.println(message);
}
}
protected void logDebugMessage(LogCategory category, String message) {
if (logger != null) {
logger.logDebugMessage(category, message);
} else {
System.out.println(" -"+ category.name().toLowerCase() + ": " +message);
}
}
protected void txLog(String msg) {
if (tlogging ) {
if (logger != null) {
logger.logDebugMessage(LogCategory.TX, msg);
} else {
System.out.println("-tx: "+msg);
}
}
}
@ -1294,7 +1280,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
this.canRunWithoutTerminology = canRunWithoutTerminology;
}
public void setLogger(ILoggingService logger) {
public void setLogger(@Nonnull ILoggingService logger) {
this.logger = logger;
}

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/IWorkerContext.java
View File

@ -77,6 +77,8 @@ import org.hl7.fhir.utilities.validation.ValidationOptions;
import com.google.gson.JsonSyntaxException;
import javax.annotation.Nonnull;
/**
* This is the standard interface used for access to underlying FHIR
@ -802,7 +804,7 @@ public interface IWorkerContext {
public void logDebugMessage(LogCategory category, String message); // verbose; only when debugging
}
public void setLogger(ILoggingService logger);
public void setLogger(@Nonnull ILoggingService logger);
public ILoggingService getLogger();
public boolean isNoTerminologyServer();

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SimpleWorkerContext.java
View File

@ -359,7 +359,7 @@ public class SimpleWorkerContext extends BaseWorkerContext implements IWorkerCon
Bundle bnd = (Bundle) f;
for (BundleEntryComponent e : bnd.getEntry()) {
if (e.getFullUrl() == null) {
logDebugMessage(LogCategory.CONTEXT, "unidentified resource in " + name+" (no fullUrl)");
logger.logDebugMessage(LogCategory.CONTEXT, "unidentified resource in " + name+" (no fullUrl)");
}
if (filter == null || filter.isOkToLoad(e.getResource())) {
String path = loader != null ? loader.getResourcePath(e.getResource()) : null;

14
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/SystemOutLoggingService.java Normal file
View File

@ -0,0 +1,14 @@
package org.hl7.fhir.r5.context;
class SystemOutLoggingService implements IWorkerContext.ILoggingService {
@Override
public void logMessage(String message) {
System.out.println(message);
}
@Override
public void logDebugMessage(LogCategory category, String message) {
System.out.println(" -" + category.name().toLowerCase() + ": " + message);
}
}