Add logger to config. (#16)

* Add logger to config.

Author: onrik

README.md

@@ -50,14 +50,16 @@ err := postgres.Stop()
 ```
 or with created with custom configuration
 ```go
+logger := &bytes.Byffer{}
 postgres := NewDatabase(DefaultConfig().
             Username("beer").
             Password("wine").
             Database("gin").
             Version(V12).
             RuntimePath("/tmp").
             Port(9876).
-            StartTimeout(45 * time.Second))
+            StartTimeout(45 * time.Second).
+            Logger(logger))
 err := postgres.Start()
 
 // Do test logic

config.go

@@ -1,6 +1,10 @@
 package embeddedpostgres
 
-import "time"
+import (
+	"io"
+	"os"
+	"time"
+)
 
 // Config maintains the runtime configuration for the Postgres process to be created.
 type Config struct {
@@ -12,6 +16,7 @@ type Config struct {
 	runtimePath  string
 	locale       string
 	startTimeout time.Duration
+	logger       io.Writer
 }
 
 // DefaultConfig provides a default set of configuration to be used "as is" or modified using the provided builders.
@@ -30,6 +35,7 @@ func DefaultConfig() Config {
 		username:     "postgres",
 		password:     "postgres",
 		startTimeout: 15 * time.Second,
+		logger:       os.Stdout,
 	}
 }
 
@@ -81,6 +87,12 @@ func (c Config) StartTimeout(timeout time.Duration) Config {
 	return c
 }
 
+// Logger sets the logger for postgres output
+func (c Config) Logger(logger io.Writer) Config {
+	c.logger = logger
+	return c
+}
+
 // PostgresVersion represents the semantic version used to fetch and run the Postgres process.
 type PostgresVersion string
 

embedded_postgres.go

@@ -3,6 +3,7 @@ package embeddedpostgres
 import (
 	"errors"
 	"fmt"
+	"io"
 	"log"
 	"net"
 	"os"
@@ -75,7 +76,7 @@ func (ep *EmbeddedPostgres) Start() error {
 		return fmt.Errorf("unable to extract postgres archive %s to %s", cacheLocation, binaryExtractLocation)
 	}
 
-	if err := ep.initDatabase(binaryExtractLocation, ep.config.username, ep.config.password, ep.config.locale); err != nil {
+	if err := ep.initDatabase(binaryExtractLocation, ep.config.username, ep.config.password, ep.config.locale, ep.config.logger); err != nil {
 		return err
 	}
 
@@ -86,15 +87,15 @@ func (ep *EmbeddedPostgres) Start() error {
 	ep.started = true
 
 	if err := ep.createDatabase(ep.config.port, ep.config.username, ep.config.password, ep.config.database); err != nil {
-		if stopErr := stopPostgres(binaryExtractLocation); stopErr != nil {
+		if stopErr := stopPostgres(binaryExtractLocation, ep.config.logger); stopErr != nil {
 			return fmt.Errorf("unable to stop database casused by error %s", err)
 		}
 
 		return err
 	}
 
 	if err := healthCheckDatabaseOrTimeout(ep.config); err != nil {
-		if stopErr := stopPostgres(binaryExtractLocation); stopErr != nil {
+		if stopErr := stopPostgres(binaryExtractLocation, ep.config.logger); stopErr != nil {
 			return fmt.Errorf("unable to stop database casused by error %s", err)
 		}
 
@@ -112,7 +113,7 @@ func (ep *EmbeddedPostgres) Stop() error {
 	}
 
 	binaryExtractLocation := userLocationOrDefault(ep.config.runtimePath, cacheLocation)
-	if err := stopPostgres(binaryExtractLocation); err != nil {
+	if err := stopPostgres(binaryExtractLocation, ep.config.logger); err != nil {
 		return err
 	}
 
@@ -127,8 +128,8 @@ func startPostgres(binaryExtractLocation string, config Config) error {
 		"-D", filepath.Join(binaryExtractLocation, "data"),
 		"-o", fmt.Sprintf(`"-p %d"`, config.port))
 	log.Println(postgresProcess.String())
-	postgresProcess.Stderr = os.Stderr
-	postgresProcess.Stdout = os.Stdout
+	postgresProcess.Stderr = config.logger
+	postgresProcess.Stdout = config.logger
 
 	if err := postgresProcess.Run(); err != nil {
 		return fmt.Errorf("could not start postgres using %s", postgresProcess.String())
@@ -137,12 +138,12 @@ func startPostgres(binaryExtractLocation string, config Config) error {
 	return nil
 }
 
-func stopPostgres(binaryExtractLocation string) error {
+func stopPostgres(binaryExtractLocation string, logger io.Writer) error {
 	postgresBinary := filepath.Join(binaryExtractLocation, "bin/pg_ctl")
 	postgresProcess := exec.Command(postgresBinary, "stop", "-w",
 		"-D", filepath.Join(binaryExtractLocation, "data"))
-	postgresProcess.Stderr = os.Stderr
-	postgresProcess.Stdout = os.Stdout
+	postgresProcess.Stderr = logger
+	postgresProcess.Stdout = logger
 
 	return postgresProcess.Run()
 }

embedded_postgres_test.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net"
 	"os"
@@ -117,7 +118,7 @@ func Test_ErrorWhenUnableToInitDatabase(t *testing.T) {
 		return jarFile, true
 	}
 
-	database.initDatabase = func(binaryExtractLocation, username, password, locale string) error {
+	database.initDatabase = func(binaryExtractLocation, username, password, locale string, logger io.Writer) error {
 		return errors.New("ah it did not work")
 	}
 
@@ -220,7 +221,7 @@ func Test_ErrorWhenCannotStartPostgresProcess(t *testing.T) {
 		return jarFile, true
 	}
 
-	database.initDatabase = func(binaryExtractLocation, username, password, locale string) error {
+	database.initDatabase = func(binaryExtractLocation, username, password, locale string, logger io.Writer) error {
 		return nil
 	}
 
@@ -249,7 +250,9 @@ func Test_CustomConfig(t *testing.T) {
 		RuntimePath(tempDir).
 		Port(9876).
 		StartTimeout(10 * time.Second).
-		Locale("C"))
+		Locale("C").
+		Logger(nil))
+
 	if err := database.Start(); err != nil {
 		shutdownDBAndFail(t, err, database)
 	}

prepare_database.go

@@ -5,18 +5,18 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"io"
 	"io/ioutil"
-	"os"
 	"os/exec"
 	"path/filepath"
 
 	"github.com/lib/pq"
 )
 
-type initDatabase func(binaryExtractLocation, username, password, locale string) error
+type initDatabase func(binaryExtractLocation, username, password, locale string, logger io.Writer) error
 type createDatabase func(port uint32, username, password, database string) error
 
-func defaultInitDatabase(binaryExtractLocation, username, password, locale string) error {
+func defaultInitDatabase(binaryExtractLocation, username, password, locale string, logger io.Writer) error {
 	passwordFile, err := createPasswordFile(binaryExtractLocation, password)
 	if err != nil {
 		return err
@@ -35,8 +35,8 @@ func defaultInitDatabase(binaryExtractLocation, username, password, locale strin
 
 	postgresInitDbBinary := filepath.Join(binaryExtractLocation, "bin/initdb")
 	postgresInitDbProcess := exec.Command(postgresInitDbBinary, args...)
-	postgresInitDbProcess.Stderr = os.Stderr
-	postgresInitDbProcess.Stdout = os.Stdout
+	postgresInitDbProcess.Stderr = logger
+	postgresInitDbProcess.Stdout = logger
 
 	if err := postgresInitDbProcess.Run(); err != nil {
 		return fmt.Errorf("unable to init database using: %s", postgresInitDbProcess.String())

prepare_database_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func Test_defaultInitDatabase_ErrorWhenCannotCreatePasswordFile(t *testing.T) {
-	err := defaultInitDatabase("path_not_exists", "Tom", "Beer", "")
+	err := defaultInitDatabase("path_not_exists", "Tom", "Beer", "", os.Stderr)
 
 	assert.EqualError(t, err, "unable to write password file to path_not_exists/pwfile")
 }
@@ -28,7 +28,7 @@ func Test_defaultInitDatabase_ErrorWhenCannotStartInitDBProcess(t *testing.T) {
 		}
 	}()
 
-	err = defaultInitDatabase(tempDir, "Tom", "Beer", "")
+	err = defaultInitDatabase(tempDir, "Tom", "Beer", "", os.Stderr)
 
 	assert.EqualError(t, err, fmt.Sprintf("unable to init database using: %s/bin/initdb -A password -U Tom -D %s/data --pwfile=%s/pwfile",
 		tempDir,
@@ -49,7 +49,7 @@ func Test_defaultInitDatabase_ErrorInvalidLocaleSetting(t *testing.T) {
 		}
 	}()
 
-	err = defaultInitDatabase(tempDir, "postgres", "postgres", "en_XY")
+	err = defaultInitDatabase(tempDir, "postgres", "postgres", "en_XY", os.Stderr)
 
 	assert.EqualError(t, err, fmt.Sprintf("unable to init database using: %s/bin/initdb -A password -U postgres -D %s/data --pwfile=%s/pwfile --locale=en_XY",
 		tempDir,