Pull request: all: upd go, minor imp
Merge in DNS/adguard-home from minor-imp to master Squashed commit of the following: commit c5b9e2a15290760b2782acc0c08df3fe57356500 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Fri Dec 10 14:23:28 2021 +0300 all: upd go, minor imp
This commit is contained in:
@@ -118,8 +118,8 @@ func PIDByCommand(command string, except ...int) (pid int, err error) {
|
||||
}
|
||||
|
||||
// parsePSOutput scans the output of ps searching the largest PID of the process
|
||||
// associated with cmdName ignoring PIDs from ignore. Valid r's line shoud be
|
||||
// like:
|
||||
// associated with cmdName ignoring PIDs from ignore. A valid line from
|
||||
// r should look like these:
|
||||
//
|
||||
// 123 ./example-cmd
|
||||
// 1230 some/base/path/example-cmd
|
||||
|
||||
@@ -559,7 +559,7 @@ func (s *Server) IsRunning() bool {
|
||||
return s.isRunning
|
||||
}
|
||||
|
||||
// srvClosedErr is returned when the method can't complete without unacessible
|
||||
// srvClosedErr is returned when the method can't complete without inacessible
|
||||
// data from the closing server.
|
||||
const srvClosedErr errors.Error = "server is closed"
|
||||
|
||||
|
||||
@@ -651,7 +651,7 @@ func newRuleStorage(filters []Filter) (rs *filterlist.RuleStorage, err error) {
|
||||
|
||||
rs, err = filterlist.NewRuleStorage(lists)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("creating rule stroage: %w", err)
|
||||
return nil, fmt.Errorf("creating rule storage: %w", err)
|
||||
}
|
||||
|
||||
return rs, nil
|
||||
|
||||
Reference in New Issue
Block a user