Adjust prefix of logs; adjust default flags

Author: ruffrey

Makefile

@@ -4,9 +4,11 @@ build: build-arm64 build-x86
 
 build-arm64:
 	env CGO_ENABLED=1 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc go build -o out/journalwatch-arm64 ./cmd
+	chmod +x out/journalwatch-arm64
 
 build-x86:
 	env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 CC=x86_64-linux-gnu-gcc go build -o out/journalwatch-x86 ./cmd
+	chmod +x out/journalwatch-x86
 
 clean:
 	rm -f out/*

README.md

@@ -13,10 +13,10 @@ journalwatch -h
   -aws-region string
     	aws region name (default "us-west-2")
   -buffer-time int
-    	log buffer max time in seconds to foward to cloudwatch regardless of buffer size (default 5)
+    	log buffer max time in seconds to foward to cloudwatch regardless of buffer size (default 8)
   -h	print help
   -log-buffer int
-    	log buffer max limit before forward to CloudWatch (default 10)
+    	log buffer max limit before forward to CloudWatch (default 20)
   -log-group string
     	(required) cloudwatch log group name
   -log-stream string

cmd/main.go

@@ -14,8 +14,8 @@ var logStream = flag.String("log-stream", "", "cloudwatch log stream name, defau
 
 var awsRegion = flag.String("aws-region", "us-west-2", "aws region name")
 
-var logBufferLimit = flag.Int("log-buffer", 10, "log buffer max limit before forward to CloudWatch")
-var timeoutSeconds = flag.Int("buffer-time", 5, "log buffer max time in seconds to foward to cloudwatch regardless of buffer size")
+var logBufferLimit = flag.Int("log-buffer", 20, "log buffer max limit before forward to CloudWatch")
+var timeoutSeconds = flag.Int("buffer-time", 8, "log buffer max time in seconds to foward to cloudwatch regardless of buffer size")
 var help = flag.Bool("h", false, "print help")
 
 func main() {

journalwatch/journalwatch.go

@@ -7,6 +7,7 @@ import (
 	"github.com/coreos/go-systemd/v22/sdjournal"
 	"log"
 	"os"
+	"strings"
 	"sync"
 	"time"
 )
@@ -115,7 +116,7 @@ func (jw *JournalWatch) readJournal(journal *sdjournal.Journal, logChan chan<- *
 		t := time.Unix(0, int64(ts)*1000)
 
 		event := &cloudwatchlogs.InputLogEvent{
-			Message:   aws.String(msg),
+			Message:   aws.String(strings.Replace(msg, "MESSAGE=", "", 1)),
 			Timestamp: aws.Int64(t.UnixNano() / int64(time.Millisecond)),
 		}