balki/tglistbot
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

update anyhttp

Browse Source
This commit is contained in:
Balakrishnan Balasubramanian 2024-12-19 16:12:51 -05:00
parent 5223b6fe85
commit d03fa76657
3 changed files with 10 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -1,5 +1,5 @@
module go.balki.me/tglistbot module go.balki.me/tglistbot
go 1.21 go 1.23.4
require go.balki.me/anyhttp v0.3.0 require go.balki.me/anyhttp v0.4.0

4
go.sum
View File

@ -1,2 +1,2 @@
go.balki.me/anyhttp v0.3.0 h1:WtBQ0rnkg567sX/O4ij/+qBbdCIUt5VURSe718sITBY= go.balki.me/anyhttp v0.4.0 h1:K639Mc8qCIO5B6ugLJCLQenkwxh9rihEK5JZ/xNfvV0=
go.balki.me/anyhttp v0.3.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s= go.balki.me/anyhttp v0.4.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s=

36
main.go
View File

@ -3,7 +3,6 @@ package main
import ( import (
"bytes" "bytes"
"context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io" "io"
@ -17,7 +16,6 @@ import (
"time" "time"
"go.balki.me/anyhttp" "go.balki.me/anyhttp"
"go.balki.me/anyhttp/idle"
"go.balki.me/tglistbot/glist" "go.balki.me/tglistbot/glist"
) )
@ -28,9 +26,8 @@ var apiToken string
var usage = `Telegram List bot var usage = `Telegram List bot
Environment variables: Environment variables:
TGLB_API_TOKEN (required) : See https://core.telegram.org/bots#how-do-i-create-a-bot TGLB_API_TOKEN (required) : See https://core.telegram.org/bots#how-do-i-create-a-bot
TGLB_ADDR (default 28923) : See https://pkg.go.dev/go.balki.me/anyhttp#readme-address-syntax TGLB_ADDR (default :28923) : See https://pkg.go.dev/go.balki.me/anyhttp#readme-address-syntax
TGLB_DATA_PATH (default .) : Directory path where list data is stored TGLB_DATA_PATH (default .) : Directory path where list data is stored
TGLB_TIMEOUT (default 30m) : Timeout to auto shutdown if using systemd-fd, See https://pkg.go.dev/time#ParseDuration
` `
func main() { func main() {
@ -46,7 +43,7 @@ func main() {
addr := func() string { addr := func() string {
addr := os.Getenv("TGLB_ADDR") addr := os.Getenv("TGLB_ADDR")
if addr == "" { if addr == "" {
return "28923" return ":28923"
} }
return addr return addr
}() }()
@ -63,18 +60,6 @@ func main() {
return dataPath return dataPath
}() }()
timeout := func() time.Duration {
timeoutStr := os.Getenv("TGLB_TIMEOUT")
if timeoutStr == "" {
return 30 * time.Minute
}
timeout, err := time.ParseDuration(timeoutStr)
if err != nil {
log.Panicf("Invalid timeout: %q\n", timeoutStr)
}
return timeout
}()
glist.DataPath = dataPath glist.DataPath = dataPath
version := func() string { version := func() string {
@ -169,24 +154,11 @@ func main() {
} }
}) })
addrType, server, done, err := anyhttp.Serve(addr, idle.WrapHandler(nil))
err := anyhttp.ListenAndServe(addr, nil)
if err != nil { if err != nil {
log.Panicln(err) log.Panicln(err)
} }
if addrType == anyhttp.SystemdFD {
log.Println("server started")
if err := idle.Wait(timeout); err != nil {
log.Panicln(err)
}
log.Printf("server idle for %v, shutting down\n", timeout)
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute) // Don't want any stuck connections
defer cancel()
if err := server.Shutdown(ctx); err != nil {
log.Panicln(err)
}
} else {
<-done
}
} }
func handleTextAdded(gl *glist.GList, text string) { func handleTextAdded(gl *glist.GList, text string) {