From 430fbb30998e65cacb0c2a8b30972e6541463d23 Mon Sep 17 00:00:00 2001
From: Aaron Jacobs <jacobsa@google.com>
Date: Mon, 25 May 2015 14:18:50 +1000
Subject: [PATCH] Updated mounted_file_system.go.

---
 mounted_file_system.go | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/mounted_file_system.go b/mounted_file_system.go
index c3e8211..e7bb812 100644
--- a/mounted_file_system.go
+++ b/mounted_file_system.go
@@ -16,6 +16,7 @@ package fuse
 
 import (
 	"fmt"
+	"io/ioutil"
 	"log"
 	"runtime"
 
@@ -154,7 +155,7 @@ func Mount(
 	dir string,
 	server Server,
 	config *MountConfig) (mfs *MountedFileSystem, err error) {
-	logger := getLogger()
+	debugLogger := getDebugLogger()
 
 	// Initialize the struct.
 	mfs = &MountedFileSystem{
@@ -163,7 +164,7 @@ func Mount(
 	}
 
 	// Open a bazilfuse connection.
-	logger.Println("Opening a bazilfuse connection.")
+	debugLogger.Println("Opening a bazilfuse connection.")
 	bfConn, err := bazilfuse.Mount(mfs.dir, config.bazilfuseOptions()...)
 	if err != nil {
 		err = fmt.Errorf("bazilfuse.Mount: %v", err)
@@ -176,8 +177,19 @@ func Mount(
 		opContext = context.Background()
 	}
 
+	// Create a /dev/null error logger if necessary.
+	errorLogger := config.ErrorLogger
+	if errorLogger == nil {
+		errorLogger = log.New(ioutil.Discard, "", 0)
+	}
+
 	// Create our own Connection object wrapping it.
-	connection, err := newConnection(opContext, logger, bfConn)
+	connection, err := newConnection(
+		opContext,
+		debugLogger,
+		errorLogger,
+		bfConn)
+
 	if err != nil {
 		bfConn.Close()
 		err = fmt.Errorf("newConnection: %v", err)