Skip to content

Commit

Permalink
enhance Logging - Header Line, Date Formatter, parsed Date ... (#152)
Browse files Browse the repository at this point in the history
* adjust logging levels - debug vs trace

* add more logging - HeaderLine, Date Formatter, parsed Date, Start & End Dates

* reverse change for VersionNumber
  • Loading branch information
Pitterling committed Sep 24, 2018
1 parent 72f2da0 commit 3c56fbf
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
8 changes: 5 additions & 3 deletions src/main/java/net/atomique/ksar/AllParser.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2017 The kSAR Project. All rights reserved.
* Copyright 2018 The kSAR Project. All rights reserved.
* See the LICENSE file in the project root for more information.
*/

Expand Down Expand Up @@ -111,10 +111,9 @@ public boolean setDate(String s) {
formatter = DateTimeFormatter.ofPattern(dateFormat);
}

log.debug("Date formatter: {}",formatter);
currentDate = LocalDate.parse(s, formatter);

parsedate = currentDate;

startDate = LocalDate.parse(sarStartDate, formatter);
endDate = LocalDate.parse(sarEndDate, formatter);

Expand All @@ -123,12 +122,15 @@ public boolean setDate(String s) {
return false;
}

parsedate = currentDate;

if (currentDate.compareTo(startDate) < 0) {
sarStartDate = s;
}
if (currentDate.compareTo(endDate) > 0) {
sarEndDate = s;
}
log.debug("parsedDate: {}, startDate: {}, EndDate: {}",currentDate, sarStartDate, sarEndDate);
return true;
}

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/net/atomique/ksar/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,9 @@ public static void main(String[] args) {
int i = 0;
String arg;

log.trace("main - Start");
log.trace("Java runtime Version : {}", System.getProperty("java.runtime.version"));
log.trace("Java runtime architecture : {}", System.getProperty("os.arch"));
log.trace("ksar Version : {}", VersionNumber.getVersionNumber());
log.debug("Java runtime Version : {}", System.getProperty("java.runtime.version"));
log.debug("Java runtime architecture : {}", System.getProperty("os.arch"));

/// load default - Mac OS X Application Properties
String mrjVersion = System.getProperty("mrj.version");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/atomique/ksar/kSar.java
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ public int parse(BufferedReader br) {

parsing_end = System.currentTimeMillis();
if (GlobalOptions.isDodebug()) {
log.debug("time to parse: {} ms", (parsing_end - parsing_start));
log.trace("time to parse: {} ms", (parsing_end - parsing_start));
if (myparser != null) {
log.debug("number of datesamples: {}", myparser.DateSamples.size());
log.trace("number of datesamples: {}", myparser.DateSamples.size());
}
}
Parsing = false;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/net/atomique/ksar/parser/Linux.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class Linux extends OSParser {

public void parse_header(String s) {

log.debug("Header Line : {}", s);
String[] columns = s.split("\\s+");

String tmpstr;
Expand Down Expand Up @@ -70,12 +71,12 @@ private void checkDateFormat() {
timeColumn = 2;
}
}

log.debug("Date Format: {}, Time Format: {}", dateFormat, timeFormat);
}

private void askDateFormat() {

log.debug("askDateFormat - provide date format");
log.trace("askDateFormat - provide date format");
if (GlobalOptions.hasUI()) {
LinuxDateFormat tmp = new LinuxDateFormat(GlobalOptions.getUI(), true);
tmp.setTitle("Provide date format");
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/net/atomique/ksar/ui/DataView.java
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,9 @@ private void jTree1ValueChanged(
TreePath treepath = evt.getPath();
Object obj = treepath.getLastPathComponent();
if (obj != null) {
if (GlobalOptions.isDodebug()) {
log.debug("mem: {}", Runtime.getRuntime().totalMemory());
log.debug("free: {}", Runtime.getRuntime().freeMemory());
}

log.trace("mem: {}", Runtime.getRuntime().totalMemory());
log.trace("free: {}", Runtime.getRuntime().freeMemory());

SortedTreeNode treenode = (SortedTreeNode) obj;
if (treenode.getRoot() == treenode) {
Expand Down

0 comments on commit 3c56fbf

Please sign in to comment.