Read log from a file rather than stdin

chkno · chkno · commit f584a03f44e0 · 2013-09-14T21:44:34.000-07:00
diff --git a/tl-view.php b/tl-view.php
@@ -1,4 +1,4 @@
 <?php
   header("Content-Type: text/html");
-  passthru("/path/to/built/go/tl < /tmp/tl.log");
+  passthru("/path/to/built/go/tl --log_file=/tmp/tl.log");
 ?>
diff --git a/tl.go b/tl.go
@@ -20,6 +20,10 @@ var initial_days = flag.Int(
 	"initial_days", 14,
 	"How many days to display initially")
 
+var log_filename = flag.String(
+	"log_file", "tl.log",
+	"Where to keep the log")
+
 var template_path = flag.String(
 	"template_path", ".",
 	"Where to find the HTML template file")
@@ -215,8 +219,13 @@ func execute_template(r Report, out io.Writer) error {
 	return nil
 }
 
-func view_handler(in io.Reader, out io.Writer) error {
-	all_events, err := read_data_file(in)
+func view_handler(out io.Writer) error {
+	log_file, err := os.Open(*log_filename)
+	if err != nil {
+		return err
+	}
+	defer log_file.Close()
+	all_events, err := read_data_file(log_file)
 	if err != nil {
 		return err
 	}
@@ -234,7 +243,7 @@ func view_handler(in io.Reader, out io.Writer) error {
 
 func main() {
 	flag.Parse()
-	if err := view_handler(os.Stdin, os.Stdout); err != nil {
+	if err := view_handler(os.Stdout); err != nil {
 		log.Fatalln(err)
 	}
 }
diff --git a/tl_test.go b/tl_test.go
@@ -1,20 +1,13 @@
 package main
 
 import (
-	"bytes"
 	"io/ioutil"
 	"testing"
 )
 
 func BenchmarkView(b *testing.B) {
-	buf, err := ioutil.ReadFile("testdata")
-	if err != nil {
-		b.Fatal("Could not read testdata", err)
-	}
-	reader := bytes.NewReader(buf)
-	b.ResetTimer()
+	*log_filename = "testdata"
 	for i := 0; i < b.N; i++ {
-		reader.Seek(0, 0)
-		view_handler(reader, ioutil.Discard)
+		view_handler(ioutil.Discard)
 	}
 }
