Compare commits

...

4 Commits

Author SHA1 Message Date
Ihor Istomin
25dd7f3731 fix(TDI-33080): We should ignore Exceptions only, not Errors 2017-07-25 11:27:46 +03:00
Ihor Istomin
a4859bef2f fix(TDI-33080): Ignore internal errors occuring on logging via LogCatcher 2017-07-10 16:12:00 +03:00
Ihor Istomin
ad88667c3e fix(TDI-33080): Fix logic and handling of parameters 2017-07-04 17:45:11 +03:00
Ihor Istomin
9b68dd1899 fix(TDI-33080): Implement ignoring of LogCatcher internal errors 2017-06-08 17:57:22 +03:00
9 changed files with 866 additions and 829 deletions

View File

@@ -3,7 +3,7 @@
<HEADER
PLATEFORM="ALL"
SERIAL=""
VERSION="0.101"
VERSION="0.102"
STATUS="ALPHA"
COMPATIBILITY="ALL"

View File

@@ -16,7 +16,7 @@
String code = ElementParameterParser.getValue(node, "__CODE__");
final boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
%>
try {
<%
if (node.getProcess().getNodesOfType("tLogCatcher").size() > 0) {
List<INode> logCatchers = (List<INode>)node.getProcess().getNodesOfType("tLogCatcher");
@@ -41,6 +41,11 @@
%>
globalMap.put("<%=cid %>_DIE_MESSAGE", <%=ElementParameterParser.getValue(node, "__MESSAGE__") %>);
globalMap.put("<%=cid %>_DIE_MESSAGES", <%=ElementParameterParser.getValue(node, "__MESSAGE__") %>);
} catch (Exception | Error e_<%=cid%>) {
logIgnoredError(String.format("<%=cid%> - tDie failed to log message due to internal error: %s", e_<%=cid%>), e_<%=cid%>);
}
currentComponent = "<%=cid %>";
status = "failure";
<%

View File

@@ -4,6 +4,7 @@
org.talend.designer.codegen.config.CodeGeneratorArgument
org.talend.core.model.process.IConnection
org.talend.core.model.process.IConnectionCategory
org.talend.core.model.process.ElementParameterParser
"
%>
@@ -13,6 +14,7 @@
String cid = node.getUniqueName();
%>
try {
for (LogCatcherUtils.LogCatcherMessage lcm : <%=cid %>.getMessages()) {
<%
for (IConnection conn : node.getOutgoingConnections()) {

View File

@@ -1,3 +1,16 @@
<%@ jet
imports="
org.talend.core.model.process.INode
org.talend.designer.codegen.config.CodeGeneratorArgument
org.talend.core.model.process.ElementParameterParser
"
%>
}
<%
CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
INode node = (INode)codeGenArgument.getArgument();
String cid = node.getUniqueName();
%>
}
} catch (Exception e_<%=cid%>) {
logIgnoredError(String.format("<%=cid%> - tLogCatcher failed to process log message(s) due to internal error: %s", e_<%=cid%>), e_<%=cid%>);
}

View File

@@ -3,7 +3,7 @@
<HEADER
PLATEFORM="ALL"
SERIAL=""
VERSION="0.101"
VERSION="0.102"
STATUS="ALPHA"
COMPATIBILITY="ALL"

View File

@@ -6,4 +6,3 @@ CATCH_JAVA_EXCEPTION.NAME=Catch Java Exception
CATCH_TDIE.NAME=Catch tDie
CATCH_TWARN.NAME=Catch tWarn
CATCH_TACTIONFAILURE.NAME=Catch tActionFailure

View File

@@ -3,7 +3,7 @@
<HEADER
PLATEFORM="ALL"
SERIAL=""
VERSION="0.101"
VERSION="0.102"
STATUS="ALPHA"
COMPATIBILITY="ALL"

View File

@@ -11,6 +11,7 @@
CodeGeneratorArgument codeGenArgument = (CodeGeneratorArgument) argument;
INode node = (INode)codeGenArgument.getArgument();
String cid = node.getUniqueName();
boolean isLog4jEnabled = ("true").equals(ElementParameterParser.getValue(node.getProcess(), "__LOG4J_ACTIVATE__"));
log = new LogUtil(node);
%>
@@ -31,6 +32,8 @@ if(priority.equals("1")){
label = "FATAL";
}
%>
try {
resumeUtil.addLog("USER_DEF_LOG", "NODE:<%=cid %>", "", Thread.currentThread().getId() + "", "<%=label %>","",<%=ElementParameterParser.getValue(node, "__MESSAGE__") %>,"", "");
<%
log.log4j(label.toLowerCase(), log.str("Message: "), ElementParameterParser.getValue(node, "__MESSAGE__"), log.str(". Code: "), ElementParameterParser.getValue(node, "__CODE__"));
@@ -47,7 +50,11 @@ if(priority.equals("1")){
}
}
%>
globalMap.put("<%=cid %>_WARN_MESSAGES", <%=ElementParameterParser.getValue(node, "__MESSAGE__")%>);
globalMap.put("<%=cid %>_WARN_PRIORITY", <%=ElementParameterParser.getValue(node, "__PRIORITY__") %>);
globalMap.put("<%=cid %>_WARN_CODE", <%=ElementParameterParser.getValue(node, "__CODE__") %>);
globalMap.put("<%=cid %>_WARN_MESSAGES", <%=ElementParameterParser.getValue(node, "__MESSAGE__")%>);
globalMap.put("<%=cid %>_WARN_PRIORITY", <%=ElementParameterParser.getValue(node, "__PRIORITY__") %>);
globalMap.put("<%=cid %>_WARN_CODE", <%=ElementParameterParser.getValue(node, "__CODE__") %>);
} catch (Exception e_<%=cid%>) {
logIgnoredError(String.format("<%=cid%> - tWarn failed to log message due to internal error: %s", e_<%=cid%>), e_<%=cid%>);
}