make the fullLog a parameter (and not a global value)

pull/2/head
Jean-Marc MEESSEN 4 years ago
parent 2dbb376b35
commit 76389cdf55

@ -57,7 +57,9 @@ func init() {
// loadCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle") // loadCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
} }
func loadFile() {
//returns nill if failure to process
func loadFile() (filleFullLog []LogLine) {
file, err := os.Open(inputFilename) file, err := os.Open(inputFilename)
if err != nil { if err != nil {
@ -105,7 +107,7 @@ func loadFile() {
var errorLog []string var errorLog []string
var previousLogLine LogLine var previousLogLine LogLine
var fullLog []LogLine fullLog := []LogLine{}
//Loop through all the stored lined //Loop through all the stored lined
for _, eachline := range txtlines { for _, eachline := range txtlines {
@ -263,15 +265,27 @@ func loadFile() {
} }
previousLogLine = logline previousLogLine = logline
//Go back to the top (Continue not necessary) //Go back to the top (Continue not necessary)
}
displayLogSimple(fullLog)
//Display parsing errors, if any
if len(errorLog) != 0 {
fmt.Println("\nProcessing errors:")
for _, errorLogLine := range errorLog {
fmt.Println(errorLogLine)
} }
return nil
} else {
fmt.Println("\nSuccesfuly parsed ", lineCount, " lines.")
}
return fullLog
//***** }
//** display results
//***** //displayLogSimple will print to stdout a simplified dump of a full log
// for _, filledLofLine := range fullLog { func displayLogSimple(fullLog []LogLine) {
// fmt.Println(SprintLogRecord(filledLofLine))
// }
firstLine := true firstLine := true
for _, filledLogLine := range fullLog { for _, filledLogLine := range fullLog {
if firstLine { if firstLine {
@ -282,13 +296,5 @@ func loadFile() {
fmt.Print(SprintLogInColumn(filledLogLine)) fmt.Print(SprintLogInColumn(filledLogLine))
} }
if len(errorLog) != 0 {
fmt.Println("\nProcessing errors:")
for _, errorLogLine := range errorLog {
fmt.Println(errorLogLine)
}
} else {
fmt.Println("\nSuccesfuly parsed ", lineCount, " lines.")
} }
}

Loading…
Cancel
Save