Using WithPrefix for loggers
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func (c *configurator) Start(server string, port uint16, password string, log bool) (stdout io.ReadCloser, waitFn func() error, err error) {
|
||||
c.logger.Info("%s: starting shadowsocks server", logPrefix)
|
||||
c.logger.Info("starting shadowsocks server")
|
||||
args := []string{
|
||||
"-c", string(constants.ShadowsocksConf),
|
||||
"-p", fmt.Sprintf("%d", port),
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func (c *configurator) MakeConf(port uint16, password, method string, uid, gid int) (err error) {
|
||||
c.logger.Info("%s: generating configuration file", logPrefix)
|
||||
c.logger.Info("generating configuration file")
|
||||
data := generateConf(port, password, method)
|
||||
return c.fileManager.WriteToFile(
|
||||
string(constants.ShadowsocksConf),
|
||||
|
||||
@@ -58,7 +58,7 @@ func Test_MakeConf(t *testing.T) {
|
||||
mockCtrl := gomock.NewController(t)
|
||||
defer mockCtrl.Finish()
|
||||
logger := mock_logging.NewMockLogger(mockCtrl)
|
||||
logger.EXPECT().Info("%s: generating configuration file", logPrefix).Times(1)
|
||||
logger.EXPECT().Info("generating configuration file").Times(1)
|
||||
fileManager := mock_files.NewMockFileManager(mockCtrl)
|
||||
fileManager.EXPECT().WriteToFile(
|
||||
string(constants.ShadowsocksConf),
|
||||
|
||||
@@ -8,8 +8,6 @@ import (
|
||||
"github.com/qdm12/golibs/logging"
|
||||
)
|
||||
|
||||
const logPrefix = "shadowsocks configurator"
|
||||
|
||||
type Configurator interface {
|
||||
Version() (string, error)
|
||||
MakeConf(port uint16, password, method string, uid, gid int) (err error)
|
||||
@@ -23,5 +21,8 @@ type configurator struct {
|
||||
}
|
||||
|
||||
func NewConfigurator(fileManager files.FileManager, logger logging.Logger) Configurator {
|
||||
return &configurator{fileManager, logger, command.NewCommander()}
|
||||
return &configurator{
|
||||
fileManager: fileManager,
|
||||
logger: logger.WithPrefix("shadowsocks configurator: "),
|
||||
commander: command.NewCommander()}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user