diff --git a/cmd/start.go b/cmd/start.go index b41684a..1f6a0b3 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -96,7 +96,9 @@ func start() { if lograw { fmt.Print(string(buffer)) } - utils.Append(buffer) + if utils.Append(buffer) { + fmt.Println() + } } } <-done diff --git a/utils/telegram.go b/utils/telegram.go index 09c0640..b12c302 100644 --- a/utils/telegram.go +++ b/utils/telegram.go @@ -9,21 +9,21 @@ import ( const ( EndTag = "NNNN" - Expression = "(?s)ZCZC.*NNNN[\n]" + Expression = "(?s)ZCZC.*NNNN" ) var buffer []byte var RawLog *rotatelogs.RotateLogs -func Append(data []byte) { +func Append(data []byte) bool { buffer = append(buffer, data...) if buffer[len(buffer)-1] == '\r' { buffer = append(buffer, '\n') } - check() + return check() } -func check() { +func check() bool { teleString := string(buffer) if strings.Index(teleString, EndTag) > 0 { exp, _ := regexp.Compile(Expression) @@ -35,9 +35,10 @@ func check() { RawLog.Write([]byte(telegram)) buffer = nil InsertTelegram(telegram) + return true } } - + return false } func removeEmpty(s string) string {