Skip to content

Commit

Permalink
#802
Browse files Browse the repository at this point in the history
  • Loading branch information
Donald Oakes committed Feb 14, 2020
1 parent 91cf940 commit c38e87b
Show file tree
Hide file tree
Showing 7 changed files with 66 additions and 8 deletions.
2 changes: 2 additions & 0 deletions mdw-common/src/com/centurylink/mdw/test/TestCompare.java
View file
Expand Up @@ -100,6 +100,8 @@ public static int matchRegex(String regex, String actual) {
if (end >= 0) {
String before = regexLine.substring(0, start);
String after = regexLine.substring(end + 1);
if (actualLine.length() < start)
return i + 1;
if (!before.equals(actualLine.substring(0, start)))
return i + 1;
if (!after.equals(actualLine.substring(actualLine.length() - after.length())))
Expand Down
14 changes: 10 additions & 4 deletions mdw-services/src/com/centurylink/mdw/services/process/ActivityLogger.java
View file
Expand Up @@ -13,6 +13,9 @@

public class ActivityLogger extends AbstractStandardLoggerBase {

public static final int MAX_MESSAGE_LENGTH = 3997;
public static final int MAX_THREAD_LENGTH = 29;

private ActivityRuntimeContext runtimeContext;

static {
Expand Down Expand Up @@ -154,18 +157,21 @@ public static void persist(Long processInstanceId, Long activityInstanceId, LogL
public static void persist(Long processInstanceId, Long activityInstanceId, LogLevel level, String message, Throwable t) {
boolean isLogging = PropertyManager.getBooleanProperty(PropertyNames.MDW_LOGGING_ACTIVITY_ENABLED, true);
if (isLogging && message != null) {
if (message.length() > MAX_MESSAGE_LENGTH)
message = message.substring(0, MAX_MESSAGE_LENGTH) + "...";
String thread = Thread.currentThread().getName();
if (thread.length() > 32)
thread = thread.substring(0, 28) + "...";
if (thread.length() > MAX_THREAD_LENGTH)
thread = thread.substring(0, MAX_THREAD_LENGTH) + "...";

try {
WorkflowDataAccess dataAccess = new WorkflowDataAccess();
dataAccess.addActivityLog(processInstanceId, activityInstanceId, level.toString(), thread, message);
if (t != null) {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
t.printStackTrace(new PrintStream(baos));
String stackTrace = new String(baos.toByteArray());
if (stackTrace.length() > 3997) {
stackTrace = stackTrace.substring(0, 3997) + "...";
if (stackTrace.length() > MAX_MESSAGE_LENGTH) {
stackTrace = stackTrace.substring(0, MAX_MESSAGE_LENGTH) + "...";
}
dataAccess.addActivityLog(processInstanceId, activityInstanceId, level.toString(), thread, stackTrace);
}
Expand Down
1 change: 1 addition & 0 deletions mdw-services/src/com/centurylink/mdw/services/process/ProcessEngineDriver.java
View file
Expand Up @@ -845,6 +845,7 @@ private ProcessInstance executeServiceProcess(ProcessExecutor engine, Long proce
}
String msg = InternalLogMessage.PROCESS_START.message + " - " + procdef.getQualifiedName() + "/" + procdef.getVersionString();
engineLogger.info(processId, mainProcessInst.getId(), masterRequestId, msg);
engineLogger.info(processId, mainProcessInst.getId(), masterRequestId, "Performance level = " + engineLogger.getPerformanceLevel());
engine.notifyMonitors(mainProcessInst, InternalLogMessage.PROCESS_START);
// setProcessInstanceStatus will really set to STATUS_IN_PROGRESS - hint to set START_DT as well
InternalEvent event = InternalEvent.createActivityStartMessage(startActivityId,
Expand Down
1 change: 1 addition & 0 deletions mdw-services/src/com/centurylink/mdw/services/process/ProcessExecutorImpl.java
View file
Expand Up @@ -584,6 +584,7 @@ void startProcessInstance(ProcessInstance processInstanceVO, int delay)
String msg = InternalLogMessage.PROCESS_START + " - " + process.getQualifiedName()
+ (processInstanceVO.isEmbedded() ? (" (embedded process " + process.getId() + ")") : ("/" + process.getVersionString()));
engineLogger.info(processInstanceVO.getProcessId(), processInstanceVO.getId(), processInstanceVO.getMasterRequestId(), msg);
engineLogger.info(processInstanceVO.getProcessId(), processInstanceVO.getId(), processInstanceVO.getMasterRequestId(), "Performance level = " + engineLogger.getPerformanceLevel());
}
notifyMonitors(processInstanceVO, InternalLogMessage.PROCESS_START);
// get start activity ID
Expand Down
6 changes: 3 additions & 3 deletions mdw-workflow/assets/com/centurylink/mdw/tests/workflow/.mdw/versions
View file
Expand Up @@ -3,7 +3,7 @@ ActivityException.proc=7
ActivityException.test=4
ActivityException.yaml=13
ActivityLogging.proc=2
ActivityLogging.test=2
ActivityLogging.test=3
ActivityLogging.yaml=1
AppConfig.proc=4
AttributeExpressions.proc=2
Expand Down Expand Up @@ -71,7 +71,7 @@ JMS\ Adapter.proc=3
LdapAdapter.proc=5
LdapAdapter.test=2
LdapAdapter.yaml=7
LoggingActivity.java=2
LoggingActivity.java=3
LoopBackWaiting.test=2
LoopBackWaiting.yaml=1
MDWServiceLevel_9.proc=7
Expand Down Expand Up @@ -194,7 +194,7 @@ doc-unchangedXmlBean.xml=1
doc-unchangedXmlBeanWrapper.txt=2
jsonToJson.groovy=1
jsonToXml.groovy=2
processLog.json=5
processLog.json=6
service-heteroproc-parallel-action.xml=3
service-heteroproc-parallel-response.xml=1
tester-ping.json=1
Expand Down
37 changes: 36 additions & 1 deletion mdw-workflow/assets/com/centurylink/mdw/tests/workflow/LoggingActivity.java
View file
Expand Up @@ -23,6 +23,9 @@ public Object execute(ActivityRuntimeContext runtimeContext) throws ActivityExce
super.logger.debug("super.logger.debug()");
super.logger.error("super.logger.error()", new Exception("super.logger.error()"));

// message too long
super.logger.info(TOO_LONG);

// logger
logger.info("logger.info()");
logger.debug("logger.debug()");
Expand All @@ -35,4 +38,36 @@ public Object execute(ActivityRuntimeContext runtimeContext) throws ActivityExce

return null;
}
}

private static final String TOO_LONG = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.\n" +
"Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.\n" +
"Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim.\n" +
"Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.\n" +
"Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.\n" +
"Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.\n" +
"Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum.\n" +
"Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus.\n" +
"Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum.\n" +
"Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus.\n" +
"Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo.\n" +
"Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna.\n" +
"Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien.\n" +
"Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla.\n" +
"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia.\n" +
"Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris.\n" +
"Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus.\n" +
"Vestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum.\n" +
"Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus.\n" +
"Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque.\n" +
"Phasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada.\n" +
"Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit.\n" +
"Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci.\n" +
"Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis.\n" +
"Pellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus.\n" +
"Donec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis.\n" +
"Suspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus.\n" +
"Ut varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\n" +
"In dui magna, posuere eget, vestibulum et, tempor auctor, justo. In ac felis quis tortor malesuada pretium. Pellentesque auctor neque nec urna.\n" +
"Proin sapien ipsum, porta a, auctor quis, euismod ut, mi. Aenean viverra rhoncus pede.\n" +
"Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut non enim eleifend felis pretium feugiat. Vivamus quis mi. Phasellus a est. Phase";
}
13 changes: 13 additions & 0 deletions mdw-workflow/assets/com/centurylink/mdw/tests/workflow/processLog.json
View file
Expand Up @@ -7,6 +7,12 @@
"thread": "${~.*}",
"when": "${~.*}"
},
{
"level": "INFO",
"message": "Performance level = 3",
"thread": "${~.*}",
"when": "${~.*}"
},
{
"activityInstanceId": ${~\\d*},
"level": "INFO",
Expand Down Expand Up @@ -76,6 +82,13 @@
"thread": "${~.*}",
"when": "${~.*}"
},
{
"activityInstanceId": ${~\\d*},
"level": "INFO",
"message": "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa.\nCum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus.\nDonec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim.\nDonec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo.\nNullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.\nAenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.\nAliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum.\nAenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus.\nMaecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum.\nNam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus.\nDonec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo.\nSed fringilla mauris sit amet nibh. Donec sodales sagittis magna.\nSed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien.\nVestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla.\nVestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia.\nNam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris.\nInteger ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus.\nVestibulum volutpat pretium libero. Cras id dui. Aenean ut eros et nisl sagittis vestibulum.\nNullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis hendrerit risus.\nPhasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque.\nPhasellus leo dolor, tempus non, auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada.\nPraesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit.\nVestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac placerat dolor lectus quis orci.\nPhasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc. Vestibulum fringilla pede sit amet augue. In turpis.\nPellentesque posuere. Praesent turpis. Aenean posuere, tortor sed cursus feugiat, nunc augue blandit nunc, eu sollicitudin urna dolor sagittis lacus.\nDonec elit libero, sodales nec, volutpat a, suscipit non, turpis. Nullam sagittis.\nSuspendisse pulvinar, augue ac venenatis condimentum, sem libero volutpat nibh, nec pellentesque velit pede quis nunc. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Fusce id purus.\nUt varius tincidunt libero. Phasellus dolor. Maecenas vestibulum mollis diam. Pellentesque ut neque. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.\nIn dui magna, posuere eget, vestibulum et, tempor auctor, justo. In ac felis quis tortor malesuada pretium. Pellentesque auctor neque nec urna.\nProin sapien ipsum, porta a, auctor quis, euismod ut, mi. Aenean viverra rhoncus pede.\nPellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Ut non enim eleifend felis pretium feugiat. Vivamus quis mi. Phasellus a est. P...",
"thread": "${~.*}",
"when": "${~.*}"
},
{
"activityInstanceId": ${~\\d*},
"level": "INFO",
Expand Down

0 comments on commit c38e87b

Please sign in to comment.