Compare commits

...

1 Commits

View File

@@ -101,73 +101,85 @@ class LogUtil extends BasicLogUtil{
}
public void logCompSetting(){
if(log4jEnabled){
%>
StringBuilder <%=var("log4jParamters")%> = new StringBuilder();
<%=var("log4jParamters")%>.append("Parameters:");
<%
java.util.Set<org.talend.core.model.process.EParameterFieldType> ignoredParamsTypes = new java.util.HashSet<org.talend.core.model.process.EParameterFieldType>();
ignoredParamsTypes.addAll(
java.util.Arrays.asList(
org.talend.core.model.process.EParameterFieldType.SCHEMA_TYPE,
org.talend.core.model.process.EParameterFieldType.LABEL,
org.talend.core.model.process.EParameterFieldType.EXTERNAL,
org.talend.core.model.process.EParameterFieldType.MAPPING_TYPE,
org.talend.core.model.process.EParameterFieldType.IMAGE,
org.talend.core.model.process.EParameterFieldType.TNS_EDITOR,
org.talend.core.model.process.EParameterFieldType.WSDL2JAVA,
org.talend.core.model.process.EParameterFieldType.GENERATEGRAMMARCONTROLLER,
org.talend.core.model.process.EParameterFieldType.GENERATE_SURVIVORSHIP_RULES_CONTROLLER,
org.talend.core.model.process.EParameterFieldType.REFRESH_REPORTS,
org.talend.core.model.process.EParameterFieldType.BROWSE_REPORTS,
org.talend.core.model.process.EParameterFieldType.PALO_DIM_SELECTION,
org.talend.core.model.process.EParameterFieldType.GUESS_SCHEMA,
org.talend.core.model.process.EParameterFieldType.MATCH_RULE_IMEX_CONTROLLER,
org.talend.core.model.process.EParameterFieldType.MEMO_PERL,
org.talend.core.model.process.EParameterFieldType.DBTYPE_LIST,
org.talend.core.model.process.EParameterFieldType.VERSION,
org.talend.core.model.process.EParameterFieldType.TECHNICAL,
org.talend.core.model.process.EParameterFieldType.ICON_SELECTION,
org.talend.core.model.process.EParameterFieldType.JAVA_COMMAND,
org.talend.core.model.process.EParameterFieldType.TREE_TABLE,
org.talend.core.model.process.EParameterFieldType.VALIDATION_RULE_TYPE,
org.talend.core.model.process.EParameterFieldType.DCSCHEMA,
org.talend.core.model.process.EParameterFieldType.SURVIVOR_RELATION,
org.talend.core.model.process.EParameterFieldType.REST_RESPONSE_SCHEMA_TYPE
)
);
for(org.talend.core.model.process.IElementParameter ep : org.talend.core.model.utils.NodeUtil.getDisplayedParameters(node)){
if(!ep.isLog4JEnabled() || ignoredParamsTypes.contains(ep.getFieldType())){
continue;
}
String name = ep.getName();
if(org.talend.core.model.process.EParameterFieldType.PASSWORD.equals(ep.getFieldType())){
String epName = "__" + name + "__";
String password = "";
if(org.talend.core.model.process.ElementParameterParser.canEncrypt(node, epName)){
password = org.talend.core.model.process.ElementParameterParser.getEncryptedValue(node, epName);
}else{
String passwordValue = org.talend.core.model.process.ElementParameterParser.getValue(node, epName);
if (passwordValue == null || "".equals(passwordValue.trim())) {// for the value which empty
passwordValue = "\"\"";
}
password = "routines.system.PasswordEncryptUtil.encryptPassword(" + passwordValue + ")";
}
%>
<%=var("log4jParamters")%>.append("<%=name%>" + " = " + String.valueOf(<%=password%>).substring(0, 4) + "...");
<%
}else{
String value = org.talend.core.model.utils.NodeUtil.getNormalizeParameterValue(node, ep);
%>
<%=var("log4jParamters")%>.append("<%=name%>" + " = " + <%=value%>);
<%
}
%>
<%=var("log4jParamters")%>.append(" | ");
<%
}
if(!log4jEnabled){
return;
}
debug(var("log4jParamters"));
%>
class LogUtil_<%=this.cid%> {
void logParameters() throws java.lang.Exception {
StringBuilder <%=var("log4jParamters")%> = new StringBuilder();
<%=var("log4jParamters")%>.append("Parameters:");
<%
java.util.Set<org.talend.core.model.process.EParameterFieldType> ignoredParamsTypes = new java.util.HashSet<org.talend.core.model.process.EParameterFieldType>();
ignoredParamsTypes.addAll(
java.util.Arrays.asList(
org.talend.core.model.process.EParameterFieldType.SCHEMA_TYPE,
org.talend.core.model.process.EParameterFieldType.LABEL,
org.talend.core.model.process.EParameterFieldType.EXTERNAL,
org.talend.core.model.process.EParameterFieldType.MAPPING_TYPE,
org.talend.core.model.process.EParameterFieldType.IMAGE,
org.talend.core.model.process.EParameterFieldType.TNS_EDITOR,
org.talend.core.model.process.EParameterFieldType.WSDL2JAVA,
org.talend.core.model.process.EParameterFieldType.GENERATEGRAMMARCONTROLLER,
org.talend.core.model.process.EParameterFieldType.GENERATE_SURVIVORSHIP_RULES_CONTROLLER,
org.talend.core.model.process.EParameterFieldType.REFRESH_REPORTS,
org.talend.core.model.process.EParameterFieldType.BROWSE_REPORTS,
org.talend.core.model.process.EParameterFieldType.PALO_DIM_SELECTION,
org.talend.core.model.process.EParameterFieldType.GUESS_SCHEMA,
org.talend.core.model.process.EParameterFieldType.MATCH_RULE_IMEX_CONTROLLER,
org.talend.core.model.process.EParameterFieldType.MEMO_PERL,
org.talend.core.model.process.EParameterFieldType.DBTYPE_LIST,
org.talend.core.model.process.EParameterFieldType.VERSION,
org.talend.core.model.process.EParameterFieldType.TECHNICAL,
org.talend.core.model.process.EParameterFieldType.ICON_SELECTION,
org.talend.core.model.process.EParameterFieldType.JAVA_COMMAND,
org.talend.core.model.process.EParameterFieldType.TREE_TABLE,
org.talend.core.model.process.EParameterFieldType.VALIDATION_RULE_TYPE,
org.talend.core.model.process.EParameterFieldType.DCSCHEMA,
org.talend.core.model.process.EParameterFieldType.SURVIVOR_RELATION,
org.talend.core.model.process.EParameterFieldType.REST_RESPONSE_SCHEMA_TYPE
)
);
for(org.talend.core.model.process.IElementParameter ep : org.talend.core.model.utils.NodeUtil.getDisplayedParameters(node)){
if(!ep.isLog4JEnabled() || ignoredParamsTypes.contains(ep.getFieldType())){
continue;
}
String name = ep.getName();
if(org.talend.core.model.process.EParameterFieldType.PASSWORD.equals(ep.getFieldType())){
String epName = "__" + name + "__";
String password = "";
if(org.talend.core.model.process.ElementParameterParser.canEncrypt(node, epName)){
password = org.talend.core.model.process.ElementParameterParser.getEncryptedValue(node, epName);
}else{
String passwordValue = org.talend.core.model.process.ElementParameterParser.getValue(node, epName);
if (passwordValue == null || "".equals(passwordValue.trim())) {// for the value which empty
passwordValue = "\"\"";
}
password = "routines.system.PasswordEncryptUtil.encryptPassword(" + passwordValue + ")";
}
%>
<%=var("log4jParamters")%>.append("<%=name%>" + " = " + String.valueOf(<%=password%>).substring(0, 4) + "...");
<%
}else{
String value = org.talend.core.model.utils.NodeUtil.getNormalizeParameterValue(node, ep);
%>
<%=var("log4jParamters")%>.append("<%=name%>" + " = " + <%=value%>);
<%
}
%>
<%=var("log4jParamters")%>.append(" | ");
<%
}
debug(var("log4jParamters"));
%>
}
}
new LogUtil_<%=this.cid%>().logParameters();
<%
}
//no use for now, because we log the data by rowStruct