From 6e2720506eb149ae2543de49b8d6744995cf9d70 Mon Sep 17 00:00:00 2001
From: Jacob Marble <jacobmarble@google.com>
Date: Wed, 4 Mar 2015 11:45:43 -0800
Subject: [PATCH] Improve user communication

Fill in TODO in README to reflect GitHub address. Add consistent
product+version report to stdout on all tools. Connector gets
stdout and glog.

Change-Id: I55480b5c3e83a22835bf58ac662beec02d263089
---
 README.md                              |  2 +-
 connector-init/connector-init.go       |  2 +-
 connector-monitor/connector-monitor.go |  2 +-
 connector-util/connector-util.go       |  2 ++
 connector/connector.go                 | 11 ++++++-----
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 73e9a14..34c5ae1 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ https://developers.google.com/open-source/licenses/bsd
 # Install
 ```
 $ cd ~/go/src
-$ go get TODO/cups-connector
+$ go get github.com/google/cups-connector
 $ go get github.com/golang/oauth2
 $ go get github.com/golang/glog
 $ cd cups-connector/connector
diff --git a/connector-init/connector-init.go b/connector-init/connector-init.go
index bc7deae..5673905 100644
--- a/connector-init/connector-init.go
+++ b/connector-init/connector-init.go
@@ -383,9 +383,9 @@ func stringToBool(val string) (bool, bool) {
 
 func main() {
 	flag.Parse()
+	fmt.Println("Google Cloud Print CUPS Connector version", lib.GetBuildDate())
 
 	var parsed bool
-
 	var retainUserOAuthToken bool
 	if parsed, retainUserOAuthToken = stringToBool(*retainUserOAuthTokenFlag); !parsed {
 		retainUserOAuthToken = scanYesOrNo(
diff --git a/connector-monitor/connector-monitor.go b/connector-monitor/connector-monitor.go
index 91ab04a..35b879c 100644
--- a/connector-monitor/connector-monitor.go
+++ b/connector-monitor/connector-monitor.go
@@ -23,7 +23,7 @@ var timeoutFlag = flag.Duration(
 
 func main() {
 	flag.Parse()
-	fmt.Printf("CUPS Connector version %s\n", lib.GetBuildDate())
+	fmt.Println("Google Cloud Print CUPS Connector version", lib.GetBuildDate())
 
 	config, err := lib.ConfigFromFile()
 	if err != nil {
diff --git a/connector-util/connector-util.go b/connector-util/connector-util.go
index 1d14baf..b084dcc 100644
--- a/connector-util/connector-util.go
+++ b/connector-util/connector-util.go
@@ -30,6 +30,8 @@ var (
 
 func main() {
 	flag.Parse()
+	fmt.Println("Google Cloud Print CUPS Connector version", lib.GetBuildDate())
+
 	if *deleteAllGCPPrintersFlag {
 		deleteAllGCPPrinters()
 	} else if *updateConfigFileFlag {
diff --git a/connector/connector.go b/connector/connector.go
index 3988b32..111d80e 100644
--- a/connector/connector.go
+++ b/connector/connector.go
@@ -26,8 +26,8 @@ import (
 func main() {
 	flag.Parse()
 	defer glog.Flush()
-
-	glog.Errorf("CUPS Connector version %s", lib.GetBuildDate())
+	glog.Errorf("Google Cloud Print CUPS Connector version %s", lib.GetBuildDate())
+	fmt.Println("Google Cloud Print CUPS Connector version", lib.GetBuildDate())
 
 	config, err := lib.ConfigFromFile()
 	if err != nil {
@@ -76,7 +76,6 @@ func main() {
 	if err := gcp.StartXMPP(); err != nil {
 		glog.Fatal(err)
 	}
-	glog.Info("Started XMPP successfully")
 
 	pm, err := manager.NewPrinterManager(cups, gcp, config.CUPSPrinterPollInterval,
 		config.GCPMaxConcurrentDownloads, config.CUPSJobQueueSize, config.CUPSJobFullUsername,
@@ -92,12 +91,14 @@ func main() {
 	}
 	defer m.Quit()
 
-	fmt.Printf("Google Cloud Print CUPS Connector ready to rock as proxy '%s'\n", config.ProxyName)
+	glog.Errorf("Ready to rock as proxy '%s'\n", config.ProxyName)
+	fmt.Printf("Ready to rock as proxy '%s'\n", config.ProxyName)
 
 	waitIndefinitely()
 
+	glog.Error("Shutting down")
 	fmt.Println("")
-	fmt.Println("shutting down normally")
+	fmt.Println("Shutting down")
 }
 
 // Blocks until Ctrl-C or SIGTERM.