fixed log output error reporting

Author: George Malamidis

message.go

@@ -81,12 +81,12 @@ func (this *Message) readOutputFile(path string) ([]byte, error) {
 	}
 	br := bufio.NewReader(f)
 	lr := &io.LimitedReader{br, MAX_OUTFILE_READ_LEN}
-	buf := make([]byte, 0)
-	_, e = lr.Read(buf)
+	buf := make([]byte, MAX_OUTFILE_READ_LEN)
+	n, e := lr.Read(buf)
 	if e != nil {
 		return nil, e
 	}
-	return buf, nil
+	return buf[:n], nil
 }
 
 func (this *Message) readOut() string {
@@ -100,6 +100,7 @@ func (this *Message) readOut() string {
 	} else {
 		content = append(content, []byte("STDOUT:\n")...)
 		content = append(content, stdout...)
+		content = append(content, []byte("\n")...)
 	}
 	stderr, e := this.readOutputFile(this.Stderr)
 	if e != nil {

message_test.go

@@ -1,6 +1,9 @@
 package main
 
 import (
+	"fmt"
+	"io/ioutil"
+	"os"
 	"testing"
 )
 
@@ -68,3 +71,32 @@ func TestDefaultWorkdir(t *testing.T) {
 		t.Errorf("[%s] isn't [%s]", msg.Workdir, "/tmp")
 	}
 }
+
+func TestReadOut(t *testing.T) {
+	logfile := "glowtestreadout.log"
+	logdata := "log data whatevs"
+	e := ioutil.WriteFile(logfile, []byte(logdata), os.ModePerm)
+	if e != nil {
+		t.Fatal(e)
+	}
+	defer func(t *testing.T, logfile string) {
+		e := os.Remove(logfile)
+		if e != nil {
+			t.Fatal(e)
+		}
+	}(t, logfile)
+	msg, e := NewMessage("executable", []string{"arg"}, "email", "workdir", logfile, logfile, "testtube", 0, 0)
+	hostname, e := os.Hostname()
+	if e != nil {
+		t.Fatal(e)
+	}
+	expectedOutput := fmt.Sprintf(`hostname: %s
+STDOUT:
+log data whatevs
+STDERR:
+log data whatevs`, hostname)
+	actualOutput := msg.readOut()
+	if expectedOutput != actualOutput {
+		t.Errorf("[%s] isn't [%s]", expectedOutput, actualOutput)
+	}
+}