fix: mihomo proxy-group name conflict + error message
This commit is contained in:
@@ -148,12 +148,12 @@ log-level: warning
|
||||
proxies:
|
||||
- %s
|
||||
proxy-groups:
|
||||
- name: PROXY
|
||||
- name: PROXY-GROUP
|
||||
type: select
|
||||
proxies:
|
||||
- PROXY
|
||||
rules:
|
||||
- MATCH,PROXY
|
||||
- MATCH,PROXY-GROUP
|
||||
`, port, strings.ReplaceAll(strings.TrimSuffix(string(proxyYaml), "\n"), "\n", "\n "))
|
||||
|
||||
return []byte(config), nil
|
||||
@@ -251,5 +251,5 @@ func waitTCP(host string, port int, timeout time.Duration) error {
|
||||
}
|
||||
time.Sleep(100 * time.Millisecond)
|
||||
}
|
||||
return fmt.Errorf("Timed out waiting for sing-box")
|
||||
return fmt.Errorf("Timed out waiting for mihomo")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user