Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adding stack logging #7381

Merged
merged 6 commits into from
Nov 12, 2020
Merged

adding stack logging #7381

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
141fa69
adding stack logging
qqmyers Nov 3, 2020
99d8127
adding an instance number to each line to be able to figure out parallel
qqmyers Nov 3, 2020
655244e
only log when add results in 2+ entries in stack
qqmyers Nov 10, 2020
ec87636
Merge remote-tracking branch 'IQSS/develop' into IQSS/7303
qqmyers Nov 12, 2020
31a02c4
spacing
qqmyers Nov 12, 2020
c9ca985
typo
qqmyers Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 30 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/EjbDataverseEngine.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import edu.harvard.iq.dataverse.search.IndexServiceBean;
import edu.harvard.iq.dataverse.search.SearchServiceBean;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.ejb.EJB;
import javax.ejb.Stateless;
Expand All @@ -46,6 +47,8 @@
import javax.validation.ConstraintViolation;
import javax.validation.ConstraintViolationException;

import org.apache.log4j.lf5.LogLevel;

/**
* An EJB capable of executing {@link Command}s in a JEE environment.
*
Expand Down Expand Up @@ -335,12 +338,35 @@ protected void completeCommand(Command command, Object r, Stack<Command> called)
public CommandContext getContext() {
if (ctxt == null) {
ctxt = new CommandContext() {

public Stack<Command> commandsCalled;

@Override
public void addCommand (Command command){
commandsCalled.push(command);
public void addCommand(Command command) {

if (logger.isLoggable(Level.FINE) && !commandsCalled.isEmpty()) {
int instance = (int) (100 * Math.random());
try {
logger.fine("Current Command Stack (" + instance + "): ");
commandsCalled.forEach((c) -> {
logger.fine("Command (" + instance + "): " + c.getClass().getSimpleName()
+ "for DvObjects");
for (Map.Entry<String, DvObject> e : ((Map<String, DvObject>) c.getAffectedDvObjects())
.entrySet()) {
logger.fine("(" + instance + "): " + e.getKey() + " : " + e.getValue().getId());
}
});
logger.fine("Adding command(" + instance + "): " + command.getClass().getSimpleName()
+ " for DvObjects");
for (Map.Entry<String, DvObject> e : ((Map<String, DvObject>) command
.getAffectedDvObjects()).entrySet()) {
logger.fine(e.getKey() + " : " + e.getValue().getId());
}
} catch (Exception e) {
logger.fine("Exception logging command stack(" + instance + "): " + e.getMessage());
}
}
commandsCalled.push(command);
}


Expand Down