diff options
Diffstat (limited to 'base/java-tools/src/com')
3 files changed, 10 insertions, 3 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/logging/ActivityCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/ActivityCLI.java index df012e8e8..f53e68700 100644 --- a/base/java-tools/src/com/netscape/cmstools/logging/ActivityCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/logging/ActivityCLI.java @@ -46,12 +46,19 @@ public class ActivityCLI extends CLI { super.execute(args); } - public static void printActivity(ActivityData activity) { + public static void printActivity(ActivityData activity, boolean showAll) { System.out.println(" Activity ID: " + activity.getID()); if (activity.getTokenID() != null) System.out.println(" Token ID: " + activity.getTokenID()); if (activity.getUserID() != null) System.out.println(" User ID: " + activity.getUserID()); + if (activity.getIP() != null) System.out.println(" IP: " + activity.getIP()); + if (activity.getOperation() != null) System.out.println(" Operation: " + activity.getOperation()); + if (activity.getResult() != null) System.out.println(" Result: " + activity.getResult()); if (activity.getDate() != null) System.out.println(" Date: " + activity.getDate()); + if (showAll) { + if (activity.getMessage() != null) System.out.println(" Message: " + activity.getMessage()); + } + Link link = activity.getLink(); if (verbose && link != null) { System.out.println(" Link: " + link.getHref()); diff --git a/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java index 8020b8464..413eae101 100644 --- a/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java @@ -101,7 +101,7 @@ public class ActivityFindCLI extends CLI { System.out.println(); } - ActivityCLI.printActivity(activityData); + ActivityCLI.printActivity(activityData, false); } MainCLI.printMessage("Number of entries returned " + activities.size()); diff --git a/base/java-tools/src/com/netscape/cmstools/logging/ActivityShowCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/ActivityShowCLI.java index ea0d69fec..b68d6adb5 100644 --- a/base/java-tools/src/com/netscape/cmstools/logging/ActivityShowCLI.java +++ b/base/java-tools/src/com/netscape/cmstools/logging/ActivityShowCLI.java @@ -75,6 +75,6 @@ public class ActivityShowCLI extends CLI { MainCLI.printMessage("Activity \"" + activityID + "\""); - ActivityCLI.printActivity(activityData); + ActivityCLI.printActivity(activityData, true); } } |