Merge pull request #2 from campoy/master

fixed many things...

Author: thesandlord

logpipe.go

@@ -20,6 +20,7 @@ import (
 	"io"
 	"log"
 	"os"
+	"os/signal"
 
 	flags "github.com/jessevdk/go-flags"
 
@@ -52,14 +53,43 @@ func main() {
 	if err != nil {
 		log.Fatalf("Failed to create client: %v", err)
 	}
+	errc := make(chan error)
+	client.OnError = func(err error) { errc <- err }
 
 	// Selects the log to write to.
 	logger := client.Logger(opts.LogName)
 
 	// Read from Stdin and log it to Stdout and Stackdriver
-	s := bufio.NewScanner(io.TeeReader(os.Stdin, os.Stdout))
-	for s.Scan() {
-		logger.Log(logging.Entry{Payload: s.Text()})
+	lines := make(chan string)
+	go func() {
+		s := bufio.NewScanner(io.TeeReader(os.Stdin, os.Stdout))
+		for s.Scan() {
+			lines <- s.Text()
+		}
+		if err := s.Err(); err != nil {
+			errc <- fmt.Errorf("could not read from std in: %v", err)
+		}
+		close(lines)
+	}()
+
+	signals := make(chan os.Signal)
+	signal.Notify(signals, os.Interrupt)
+
+mainLoop:
+	for {
+		select {
+		case line, ok := <-lines:
+			if !ok {
+				break mainLoop
+			}
+			logger.Log(logging.Entry{Payload: line})
+		case err := <-errc:
+			log.Printf("error received: %v", err)
+			break mainLoop
+		case <-signals:
+			fmt.Fprintln(os.Stderr, "received interrupt: exiting program")
+			break mainLoop
+		}
 	}
 
 	// Closes the client and flushes the buffer to the Stackdriver Logging
@@ -68,9 +98,5 @@ func main() {
 		log.Fatalf("Failed to close client: %v", err)
 	}
 
-	if err := s.Err(); err != nil {
-		log.Fatalf("Failed to scan input: %v", err)
-	}
-
-	log.Println("Finished logging")
+	fmt.Fprintln(os.Stderr, "Finished logging")
 }