Merge branch 'master' into justforfunc

Author: thesandlord

logpipe.go

@@ -1,17 +1,15 @@
-/*
-	Copyright 2017, Google, Inc.
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
+// 	Copyright 2017, Google, Inc.
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
 
 // Command logpipe is a service that will let you pipe logs directly to Stackdriver Logging.
 package main
@@ -55,6 +53,8 @@ func main() {
 	if err != nil {
 		errorf("Failed to create client: %v", err)
 	}
+	errc := make(chan error)
+	client.OnError = func(err error) { errc <- err }
 
 	ctx, cancel := context.WithTimeout(ctx, 1*time.Second)
 	defer cancel()
@@ -90,7 +90,7 @@ loop:
 			}
 			logger.Log(logging.Entry{Payload: line})
 		case s := <-signals:
-			fmt.Fprintf(os.Stderr, "Terminating program after received signal: %v\n", s)
+			fmt.Fprintf(os.Stderr, "Terminating program after receiving signal: %v\n", s)
 			break loop
 		}
 	}