diff --git a/glide.lock b/glide.lock index de8036c1bb..6abf171dcf 100644 --- a/glide.lock +++ b/glide.lock @@ -1,12 +1,12 @@ hash: 153a3e6a1f31b2b29a113e953098f2b42a645103ee3e10040b5e03727a7b003c -updated: 2017-06-20T10:57:34.1196597-04:00 +updated: 2017-06-28T14:40:45.6812682-04:00 imports: - name: github.com/agl/ed25519 version: 278e1ec8e8a6e017cd07577924d6766039146ced subpackages: - edwards25519 - name: github.com/btcsuite/btclog - version: 266a29b6e5ad061d4c055cec1c0049e4aae47092 + version: 84c8d2346e9fc8c7b947e243b9c24e6df9fd206a - name: github.com/btcsuite/go-flags version: 6c288d648c1cc1befcb90cb5511dcacf64ae8e61 - name: github.com/btcsuite/go-socks @@ -56,16 +56,16 @@ imports: - base58 - bloom - name: github.com/jrick/logrotate - version: 4ed05ed86ef17d10ff99cce77481e0fcf6f2c7b0 + version: a93b200c26cbae3bb09dd0dc2c7c7fe1468a034a subpackages: - rotator - name: golang.org/x/crypto - version: 0fe963104e9d1877082f8fb38f816fcd97eb1d10 + version: 84f24dfdf3c414ed893ca1b318d0045ef5a1f607 subpackages: - ripemd160 - ssh/terminal - name: golang.org/x/sys - version: e62c3de784db939836898e5c19ffd41bece347da + version: 90796e5a05ce440b41c768bd9af257005e470461 subpackages: - unix testImports: diff --git a/log.go b/log.go index 517b560adc..83426619e5 100644 --- a/log.go +++ b/log.go @@ -7,7 +7,6 @@ package main import ( "fmt" - "io" "os" "path/filepath" @@ -36,7 +35,7 @@ type logWriter struct{} func (logWriter) Write(p []byte) (n int, err error) { os.Stdout.Write(p) - logRotatorPipe.Write(p) + logRotator.Write(p) return len(p), nil } @@ -58,10 +57,6 @@ var ( // application shutdown. logRotator *rotator.Rotator - // logRotatorPipe is the write-end pipe for writing to the log rotator. It - // is written to by the Write method of the logWriter type. - logRotatorPipe *io.PipeWriter - adxrLog = backendLog.Logger("ADXR") amgrLog = backendLog.Logger("AMGR") cmgrLog = backendLog.Logger("CMGR") @@ -123,17 +118,13 @@ func initLogRotator(logFile string) { fmt.Fprintf(os.Stderr, "failed to create log directory: %v\n", err) os.Exit(1) } - pr, pw := io.Pipe() - r, err := rotator.New(pr, logFile, 10*1024, false, 3) + r, err := rotator.New(logFile, 10*1024, false, 3) if err != nil { fmt.Fprintf(os.Stderr, "failed to create file rotator: %v\n", err) os.Exit(1) } - go r.Run() - logRotator = r - logRotatorPipe = pw } // setLogLevel sets the logging level for provided subsystem. Invalid