add timestamp format option

Author: leontappe

examples/timestamps.d/timestamps.hcl

@@ -8,4 +8,5 @@ job "echoloop" {
   stdout = "test.log"
   stderr = "test_error.log"
   enableTimestamps = true
+  timestampFormat = "test"
 }

internal/config/types.go

@@ -94,9 +94,12 @@ type BaseJobConfig struct {
 	CanFail          bool     `hcl:"canFail" json:"canFail"`
 	Controllable     bool     `hcl:"controllable" json:"controllable"`
 	WorkingDirectory string   `hcl:"workingDirectory" json:"workingDirectory,omitempty"`
-	Stdout           string   `hcl:"stdout" json:"stdout,omitempty"`
-	Stderr           string   `hcl:"stderr" json:"stderr,omitempty"`
-	EnableTimestamps bool     `hcl:"enableTimestamps" json:"enableTimestamps"`
+
+	// log config
+	Stdout           string `hcl:"stdout" json:"stdout,omitempty"`
+	Stderr           string `hcl:"stderr" json:"stderr,omitempty"`
+	EnableTimestamps bool   `hcl:"enableTimestamps" json:"enableTimestamps"`
+	TimestampFormat  string `hcl:"timestampFormat" json:"timestampFormat"` // defaults to RFC3339
 }
 
 type Laziness struct {

pkg/proc/basejob.go

@@ -115,7 +115,8 @@ func (job *baseJob) startOnce(ctx context.Context, process chan<- *os.Process) e
 	cmd.Env = os.Environ()
 	cmd.Dir = job.Config.WorkingDirectory
 
-	// pipe stdout and stderr through timestamp function if they are enabled
+	// pipe command's stdout and stderr through timestamp function if timestamps are enabled
+	// otherwise just redirect stdout and err to job.stdout and job.stderr
 	if job.Config.EnableTimestamps {
 		stdoutPipe, err := cmd.StdoutPipe()
 		if err != nil {
@@ -224,12 +225,21 @@ func (job *baseJob) closeStdFiles() {
 func (job *baseJob) logWithTimestamp(r io.Reader, w io.Writer) {
 	l := log.WithField("job.name", job.Config.Name)
 
+	formatString, exists := TimeFormats[job.Config.TimestampFormat]
+	if !exists {
+		l.Warningf("unknown timestamp format %s, defaulting to RFC3339", job.Config.TimestampFormat)
+		formatString = time.RFC3339
+	}
+
 	scanner := bufio.NewScanner(r)
 	for scanner.Scan() {
-		timestamp := time.Now().Format(time.RFC3339)
+		timestamp := time.Now().Format(formatString)
 		line := fmt.Sprintf("[%s] %s\n", timestamp, scanner.Text())
-		w.Write([]byte(line))
+		if _, err := w.Write([]byte(line)); err != nil {
+			l.Errorf("error writing log for process: %v\n", err)
+		}
 	}
+
 	if err := scanner.Err(); err != nil {
 		l.Errorf("error reading from process: %v\n", err)
 	}

pkg/proc/types.go

@@ -2,21 +2,42 @@ package proc
 
 import (
 	"context"
-	"github.com/gorilla/mux"
-	"github.com/gorilla/websocket"
 	"net/http"
 	"os"
 	"os/exec"
 	"sync"
 	"time"
 
+	"github.com/gorilla/mux"
+	"github.com/gorilla/websocket"
+
 	"github.com/mittwald/mittnite/internal/config"
 )
 
 const (
 	ShutdownWaitingTimeSeconds = 10
 )
 
+var TimeFormats = map[string]string{
+	"RFC3339":     time.RFC3339,
+	"RFC3339Nano": time.RFC3339Nano,
+	"RFC1123":     time.RFC1123,
+	"RFC1123Z":    time.RFC1123Z,
+	"RFC822":      time.RFC822,
+	"RFC822Z":     time.RFC822Z,
+	"ANSIC":       time.ANSIC,
+	"UnixDate":    time.UnixDate,
+	"RubyDate":    time.RubyDate,
+	"Kitchen":     time.Kitchen,
+	"Stamp":       time.Stamp,
+	"StampMilli":  time.StampMilli,
+	"StampMicro":  time.StampMicro,
+	"StampNano":   time.StampNano,
+	"DateTime":    time.DateTime,
+	"DateOnly":    time.DateOnly,
+	"TimeOnly":    time.TimeOnly,
+}
+
 type Runner struct {
 	jobs        []Job
 	bootJobs    []*BootJob