Repository: uber-go/zap
File: writer.go (Go)

Code before:
// Copyright (c) 2016 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

package zap

import (
	"io"
	"io/ioutil"
	"os"

	"go.uber.org/zap/internal/multierror"
	"go.uber.org/zap/zapcore"
)

// Open is a high-level wrapper that takes a variadic number of paths, opens or
// creates each of the specified files, and combines them into a locked
// WriteSyncer. It also returns any error encountered and a function to close
// any opened files.
//
// Passing no paths returns a no-op WriteSyncer. The special paths "stdout" and
// "stderr" are interpreted as os.Stdout and os.Stderr, respectively.
func Open(paths ...string) (zapcore.WriteSyncer, func(), error) {
	writers, close, err := open(paths)

	if err != nil {
		return nil, nil, err
	}

	writer, err := OpenWriteSyncers(writers...)
	return writer, close, err
}

func open(paths []string) ([]zapcore.WriteSyncer, func(), error) {
	var errs multierror.Error
	writers := make([]zapcore.WriteSyncer, 0, len(paths))
	files := make([]*os.File, 0, len(paths))
	for _, path := range paths {
		switch path {
		case "stdout":
			writers = append(writers, os.Stdout)
			// Don't close standard out.
			continue
		case "stderr":
			writers = append(writers, os.Stderr)
			// Don't close standard error.
			continue
		}
		f, err := os.OpenFile(path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
		errs = errs.Append(err)
		if err == nil {
			writers = append(writers, f)
			files = append(files, f)
		}
	}
	close := func() {
		for _, f := range files {
			f.Close()
		}
	}
	return writers, close, errs.AsError()
}

// OpenWriters combines the passed io.Writer objects that are compatible with
// zapcore.WriteSyncer into a locked WriteSyncer. It returns any errors
// encountered.
func OpenWriters(writers ...io.Writer) (zapcore.WriteSyncer, error) {
	w := make([]zapcore.WriteSyncer, 0, len(writers))

	for _, writer := range writers {
		writeSyncer, ok := writer.(zapcore.WriteSyncer)
		if ok {
			w = append(w, writeSyncer)
		}
	}

	return OpenWriteSyncers(w...)
}

// OpenWriteSyncers combines the passed set of WriteSyncer objects into a locked
// WriteSyncer. It returns any error encountered
func OpenWriteSyncers(writers ...zapcore.WriteSyncer) (zapcore.WriteSyncer, error) {
	if len(writers) == 0 {
		return zapcore.AddSync(ioutil.Discard), nil
	}

	if len(writers) == 1 {
		return zapcore.Lock(writers[0]), nil
	}

	return zapcore.Lock(zapcore.NewMultiWriteSyncer(writers...)), nil
}


Review comment (suggestion):
Let's actually make this improvement to `zapcore.NewMultiWriteSyncer` - if it's passed just one argument, it should return that `WriteSyncer` unchanged. This wrapper can then rely on that behavior.

Code after:
// Copyright (c) 2016 Uber Technologies, Inc.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

package zap

import (
	"io/ioutil"
	"os"

	"go.uber.org/zap/internal/multierror"
	"go.uber.org/zap/zapcore"
)

// Open is a high-level wrapper that takes a variadic number of paths, opens or
// creates each of the specified files, and combines them into a locked
// WriteSyncer. It also returns any error encountered and a function to close
// any opened files.
//
// Passing no paths returns a no-op WriteSyncer. The special paths "stdout" and
// "stderr" are interpreted as os.Stdout and os.Stderr, respectively.
func Open(paths ...string) (zapcore.WriteSyncer, func(), error) {
	writers, close, err := open(paths)
	if err != nil {
		return nil, nil, err
	}

	writer := CombineWriteSyncers(writers...)
	return writer, close, nil
}

func open(paths []string) ([]zapcore.WriteSyncer, func(), error) {
	var errs multierror.Error
	writers := make([]zapcore.WriteSyncer, 0, len(paths))
	files := make([]*os.File, 0, len(paths))
	for _, path := range paths {
		switch path {
		case "stdout":
			writers = append(writers, os.Stdout)
			// Don't close standard out.
			continue
		case "stderr":
			writers = append(writers, os.Stderr)
			// Don't close standard error.
			continue
		}
		f, err := os.OpenFile(path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0644)
		errs = errs.Append(err)
		if err == nil {
			writers = append(writers, f)
			files = append(files, f)
		}
	}
	close := func() {
		for _, f := range files {
			f.Close()
		}
	}
	return writers, close, errs.AsError()
}

// CombineWriteSyncers combines the passed set of WriteSyncer objects into a
// locked WriteSyncer.
func CombineWriteSyncers(writers ...zapcore.WriteSyncer) zapcore.WriteSyncer {
	if len(writers) == 0 {
		return zapcore.AddSync(ioutil.Discard)
	}
	return zapcore.Lock(zapcore.NewMultiWriteSyncer(writers...))
}