burble.dn42/bird-lg-go
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

frontend: add the abilities to customized timeout time (#51)

Browse Source 
* main.go: add timeout setting

* lgproxy.go: use timeout setting when querying server

* README.md: add new timeout setting
This commit is contained in:
Nicolas Lorin 2022-02-08 09:29:05 +01:00 committed by GitHub
parent 950c018b18
commit 348295b9aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -68,6 +68,7 @@ Usage: all configuration is done via commandline parameters or environment varia
| --net-specific-mode | BIRDLG_NET_SPECIFIC_MODE | apply network-specific changes for some networks, use "dn42" for BIRD in dn42 network |
| --protocol-filter | BIRDLG_PROTOCOL_FILTER | protocol types to show in summary tables (comma separated list); defaults to all if not set |
| --name-filter | BIRDLG_NAME_FILTER | protocol names to hide in summary tables (RE2 syntax); defaults to none if not set |
| --time-out | BIRDLG_TIMEOUT | time before request timed out, in seconds; defaults to 120 if not set |
Example: the following command starts the frontend with 2 BIRD nodes, with domain name "gigsgigscloud.dn42.lantian.pub" and "hostdare.dn42.lantian.pub", and proxies are running on port 8000 on both nodes.

2
frontend/lgproxy.go
View File

@ -47,7 +47,7 @@ func batchRequest(servers []string, endpoint string, command string) []string {
}
url := "http://" + hostname + ":" + strconv.Itoa(setting.proxyPort) + "/" + url.PathEscape(endpoint) + "?q=" + url.QueryEscape(command)
go func(url string, i int) {
client := http.Client{Timeout: 120 * time.Second}
client := http.Client{Timeout: time.Duration(setting.timeOut) * time.Second}
response, err := client.Get(url)
if err != nil {
ch <- channelData{i, "request failed: " + err.Error() + "\n"}

10
frontend/main.go
View File

@ -25,6 +25,7 @@ type settingType struct {
telegramBotName string
protocolFilter []string
nameFilter string
timeOut int
}
var setting settingType
@ -45,6 +46,7 @@ func main() {
telegramBotName: "",
protocolFilter: []string{},
nameFilter: "",
timeOut: 120,
}
if env := os.Getenv("BIRDLG_SERVERS"); env != "" {
@ -99,6 +101,12 @@ func main() {
if env := os.Getenv("BIRDLG_NAME_FILTER"); env != "" {
settingDefault.nameFilter = env
}
if env := os.Getenv("BIRDLG_TIMEOUT"); env != "" {
var err error
if settingDefault.timeOut, err = strconv.Atoi(env); err != nil {
panic(err)
}
}
serversPtr := flag.String("servers", strings.Join(settingDefault.servers, ","), "server name prefixes, separated by comma")
domainPtr := flag.String("domain", settingDefault.domain, "server name domain suffixes")
@ -117,6 +125,7 @@ func main() {
protocolFilterPtr := flag.String("protocol-filter", strings.Join(settingDefault.protocolFilter, ","),
"protocol types to show in summary tables (comma separated list); defaults to all if not set")
nameFilterPtr := flag.String("name-filter", settingDefault.nameFilter, "protocol name regex to hide in summary tables (RE2 syntax); defaults to none if not set")
timeOutPtr := flag.Int("time-out", settingDefault.timeOut, "time before request timed out, in seconds; defaults to 120 if not set")
flag.Parse()
if *serversPtr == "" {
@ -164,6 +173,7 @@ func main() {
*telegramBotNamePtr,
protocolFilter,
*nameFilterPtr,
*timeOutPtr,
}
ImportTemplates()