Copy finished logs to separate folder and serve only from there

Author: g3force

cmd/ssl-auto-recorder/ssl-auto-recorder.go

@@ -23,6 +23,8 @@ var refereeEnabled = flag.Bool("referee-enabled", true, "Record referee packages
 var httpServe = flag.Bool("http-serve", true, "Serve log files via HTTP")
 var httpPort = flag.String("http-port", "8084", "HTTP port for serving log files")
 
+var outputFolder = flag.String("output-folder", "logs", "Output folder where completed logs are copied to")
+
 var VisionLegacyType = persistence.MessageType{Id: persistence.MessageSslVision2010, Name: "vision-legacy"}
 var VisionType = persistence.MessageType{Id: persistence.MessageSslVision2014, Name: "vision"}
 var VisionTrackerType = persistence.MessageType{Id: persistence.MessageSslVisionTracker2020, Name: "vision-tracker"}
@@ -31,13 +33,13 @@ var RefereeType = persistence.MessageType{Id: persistence.MessageSslRefbox2013,
 func main() {
 	flag.Parse()
 
-	autoRecorder := auto.NewRecorder()
+	autoRecorder := auto.NewRecorder(*outputFolder)
 
 	addSlots(autoRecorder.Recorder)
 	autoRecorder.Start()
 
 	if *httpServe {
-		http.Handle("/", http.FileServer(http.Dir(".")))
+		http.Handle("/", http.FileServer(http.Dir(*outputFolder)))
 		log.Printf("Serving log files on HTTP port: %s\n", *httpPort)
 		go log.Fatal(http.ListenAndServe(":"+*httpPort, nil))
 	}

pkg/auto/auto-recorder.go

@@ -6,19 +6,27 @@ import (
 	"github.com/RoboCup-SSL/ssl-go-tools/pkg/persistence"
 	"google.golang.org/protobuf/proto"
 	"log"
+	"os"
+	"path/filepath"
 	"strings"
 	"time"
 )
 
 type Recorder struct {
-	Recorder *persistence.Recorder
+	Recorder    *persistence.Recorder
+	logFileName string
+	logFileDir  string
 }
 
-func NewRecorder() (r *Recorder) {
+func NewRecorder(logFileDir string) (r *Recorder) {
 	r = new(Recorder)
 	r.Recorder = new(persistence.Recorder)
 	*r.Recorder = persistence.NewRecorder()
 	r.Recorder.AddMessageConsumer(r.consumeMessage)
+	r.logFileDir = logFileDir
+	if err := os.MkdirAll(r.logFileDir, os.ModePerm); err != nil {
+		log.Println("Could not create log file dir", err)
+	}
 	return
 }
 
@@ -45,9 +53,9 @@ func (r *Recorder) consumeMessage(message *persistence.Message) {
 	}
 
 	if !r.Recorder.IsRecording() && isTeamSet(&refMsg) && (isGameStage(&refMsg) || isPreGameStage(&refMsg)) {
-		name := logFileName(&refMsg)
-		log.Println("Start recording ", name)
-		if err := r.Recorder.StartRecording(name); err != nil {
+		r.logFileName = logFileName(&refMsg)
+		log.Println("Start recording ", r.logFileName)
+		if err := r.Recorder.StartRecording(r.logFileName); err != nil {
 			log.Println("Failed to start recorder: ", err)
 		}
 	} else if r.Recorder.IsRecording() {
@@ -56,6 +64,9 @@ func (r *Recorder) consumeMessage(message *persistence.Message) {
 			if err := r.Recorder.StopRecording(); err != nil {
 				log.Println("Failed to stop recorder: ", err)
 			}
+			if err := os.Rename(r.logFileName, filepath.Join(r.logFileDir, r.logFileName)); err != nil {
+				log.Println("Could not move log file", err)
+			}
 		} else if !r.Recorder.IsPaused() && isBreakStage(&refMsg) {
 			log.Println("Pause recording")
 			r.Recorder.SetPaused(true)