Merge from remote branch

This commit is contained in:
yaling888
2021-10-28 11:36:11 +08:00
86 changed files with 1065 additions and 461 deletions

View File

@ -2,7 +2,6 @@ package executor
import (
"fmt"
"io/ioutil"
"net"
"os"
"runtime"
@ -31,15 +30,13 @@ import (
"github.com/Dreamacro/clash/tunnel"
)
var (
mux sync.Mutex
)
var mux sync.Mutex
func readConfig(path string) ([]byte, error) {
if _, err := os.Stat(path); os.IsNotExist(err) {
return nil, err
}
data, err := ioutil.ReadFile(path)
data, err := os.ReadFile(path)
if err != nil {
return nil, err
}