Merge pull request #18 from hyeoksuhan/develop

eblogs

Author: hyeoksuhan

cmd/cmd_eblogs.go

@@ -40,7 +40,7 @@ type grepOpt struct {
 }
 
 func (o grepOpt) isEmpty() bool {
-	return o.regexp == ""
+	return strings.TrimSpace(o.regexp) == ""
 }
 
 func init() {
@@ -227,6 +227,9 @@ func streamlogs(ctx context.Context, wg *sync.WaitGroup, input streamlogsInput)
 	}
 
 	scanner := bufio.NewScanner(stdout)
+	// to prevent 'token too long' error
+	buf := make([]byte, 0, 64*1024)
+	scanner.Buffer(buf, 1024*1024)
 
 	err = cmd.Start()
 	if err != nil {
@@ -235,26 +238,42 @@ func streamlogs(ctx context.Context, wg *sync.WaitGroup, input streamlogsInput)
 
 	grepOpt := input.grepOpt
 	re := regexp.MustCompile(grepOpt.regexp)
+	cTarget := input.colorf(target)
 	remain := 0
 	for scanner.Scan() {
 		line := scanner.Text()
-		match := re.FindAllString(line, -1)
-		matched := len(match) > 0
 
-		if matched {
-			remain = grepOpt.aCount
+		if grepOpt.isEmpty() {
+			printTargetLog(cTarget, line)
+			continue
 		}
 
-		if !grepOpt.isEmpty() && !matched && remain < 0 {
+		match := re.FindAllString(line, -1)
+		matched := len(match) > 0
+		loggable := matched || remain > 0
+
+		if !loggable {
 			continue
 		}
 
 		for _, m := range match {
 			line = strings.Replace(line, m, input.colorf(m), 1)
 		}
 
-		fmt.Printf("[%s] %s\r\n", input.colorf(target), line)
-		remain--
+		printTargetLog(cTarget, line)
+
+		if grepOpt.aCount == 0 {
+			continue
+		}
+
+		if matched {
+			remain = grepOpt.aCount
+			continue
+		}
+
+		if remain--; remain == 0 {
+			fmt.Printf(input.colorf("--") + "\r\n")
+		}
 	}
 
 	err = scanner.Err()
@@ -285,6 +304,10 @@ func streamlogs(ctx context.Context, wg *sync.WaitGroup, input streamlogsInput)
 	return
 }
 
+func printTargetLog(target string, log string) {
+	fmt.Printf("[%s] %s\r\n", target, log)
+}
+
 func terminateSession(svc gossm.SSMservice, sid string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()