Merge pull request #194 from listx/fix-auditor

address review comments from #193

lib/audit/auditor.go

@@ -46,7 +46,11 @@ func initServerContext(
 	}
 
 	erc := initErrorReportingClient(gcpProjectID)
-	loggingFacility := logclient.NewGcpLoggingFacility(gcpProjectID, LogName)
+	loggingFacility, err := logclient.NewGcpLoggingFacility(
+		gcpProjectID, LogName)
+	if err != nil {
+		return nil, err
+	}
 
 	serverContext := ServerContext{
 		ID:                   uuid,

lib/logclient/fake.go

@@ -32,9 +32,9 @@ func (fakeLogClient *FakeLogClient) Close() error { return nil }
 // all local (stdout), with a FakeLogClient.
 func NewFakeLoggingFacility() *LoggingFacility {
 
-	logInfo := log.New(os.Stdout, "FAKE-INFO", log.LstdFlags)
-	logError := log.New(os.Stdout, "FAKE-ERROR", log.LstdFlags)
-	logAlert := log.New(os.Stdout, "FAKE-ALERT", log.LstdFlags)
+	logInfo := log.New(os.Stderr, "FAKE-INFO", log.LstdFlags)
+	logError := log.New(os.Stderr, "FAKE-ERROR", log.LstdFlags)
+	logAlert := log.New(os.Stderr, "FAKE-ALERT", log.LstdFlags)
 
 	return New(logInfo, logError, logAlert, &FakeLogClient{})
 }

lib/logclient/gcp.go

@@ -20,35 +20,35 @@ import (
 	"context"
 
 	"cloud.google.com/go/logging"
-	"k8s.io/klog"
 )
 
 // NewGcpLoggingFacility returns a new LoggingFacility that logs to GCP
 // resources. As such, it requires the GCP projectID as well as the logName to
 // log to.
-func NewGcpLoggingFacility(projectID, logName string) *LoggingFacility {
-	gcpLogClient := initGcpLogClient(projectID)
+func NewGcpLoggingFacility(
+	projectID, logName string,
+) (*LoggingFacility, error) {
+
+	gcpLogClient, err := initGcpLogClient(projectID)
+	if err != nil {
+		return nil, err
+	}
 
 	logInfo := gcpLogClient.Logger(logName).StandardLogger(logging.Info)
 	logError := gcpLogClient.Logger(logName).StandardLogger(logging.Error)
 	logAlert := gcpLogClient.Logger(logName).StandardLogger(logging.Alert)
 
-	return New(logInfo, logError, logAlert, gcpLogClient)
+	return New(logInfo, logError, logAlert, gcpLogClient), nil
 }
 
 // initGcpLogClient creates a logging client that performs better logging than
 // the default behavior on GCP Stackdriver. For instance, logs sent with this
 // client are not split up over newlines, and also the severity levels are
 // actually understood by Stackdriver.
-func initGcpLogClient(projectID string) *logging.Client {
+func initGcpLogClient(projectID string) (*logging.Client, error) {
 
 	ctx := context.Background()
 
 	// Creates a client.
-	client, err := logging.NewClient(ctx, projectID)
-	if err != nil {
-		klog.Fatalf("Failed to create client: %v", err)
-	}
-
-	return client
+	return logging.NewClient(ctx, projectID)
 }