提交 90ed1482 作者: Brian Tiger Chow

fix(eventlog) apply settings upon initialization

This commit applies the logging settings to the logging system upon
initialization `ipfs init` and `ipfs daemon --init`.

License: MIT
Signed-off-by: 's avatarBrian Tiger Chow <brian@perfmode.com>
上级 4d497f1c
...@@ -16,7 +16,8 @@ import ( ...@@ -16,7 +16,8 @@ import (
chunk "github.com/jbenet/go-ipfs/importer/chunk" chunk "github.com/jbenet/go-ipfs/importer/chunk"
peer "github.com/jbenet/go-ipfs/peer" peer "github.com/jbenet/go-ipfs/peer"
u "github.com/jbenet/go-ipfs/util" u "github.com/jbenet/go-ipfs/util"
"github.com/jbenet/go-ipfs/util/debugerror" debugerror "github.com/jbenet/go-ipfs/util/debugerror"
repo "github.com/jbenet/go-ipfs/repo"
) )
const nBitsForKeypairDefault = 4096 const nBitsForKeypairDefault = 4096
...@@ -251,6 +252,8 @@ func identityConfig(nbits int) (config.Identity, error) { ...@@ -251,6 +252,8 @@ func identityConfig(nbits int) (config.Identity, error) {
return ident, nil return ident, nil
} }
// initLogs initializes the event logger at the specified path. It uses the
// default log path if no path is provided.
func initLogs(logpath string) (config.Logs, error) { func initLogs(logpath string) (config.Logs, error) {
if len(logpath) == 0 { if len(logpath) == 0 {
var err error var err error
...@@ -259,15 +262,18 @@ func initLogs(logpath string) (config.Logs, error) { ...@@ -259,15 +262,18 @@ func initLogs(logpath string) (config.Logs, error) {
return config.Logs{}, debugerror.Wrap(err) return config.Logs{}, debugerror.Wrap(err)
} }
} }
err := initCheckDir(logpath) err := initCheckDir(logpath)
if err != nil { if err != nil {
return config.Logs{}, debugerror.Errorf("logs: %s", err) return config.Logs{}, debugerror.Errorf("logs: %s", err)
} }
conf := config.Logs{
return config.Logs{
Filename: path.Join(logpath, "events.log"), Filename: path.Join(logpath, "events.log"),
}, nil }
err = repo.ConfigureEventLogger(conf)
if err != nil {
return conf, err
}
return conf, nil
} }
// initCheckDir ensures the directory exists and is writable // initCheckDir ensures the directory exists and is writable
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论