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

Replace unix socket logic with go.balki.me/anyhttp

Browse Source 
Now also support systemd socket activation
This commit is contained in:
Balakrishnan Balasubramanian 2023-04-20 17:59:40 -04:00
parent 107d90deb8
commit dd62f237b0
3 changed files with 12 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -1,3 +1,5 @@
module go.balki.me/tglistbot
go 1.20
require go.balki.me/anyhttp v0.1.0

2
go.sum Normal file
View File

@ -0,0 +1,2 @@
go.balki.me/anyhttp v0.1.0 h1:ULzLWS1pRWMEduHHJxXCbvxoTmxNaWSNANV9gQ0Pigw=
go.balki.me/anyhttp v0.1.0/go.mod h1:JhfekOIjgVODoVqUCficjpIgmB3wwlB7jhN0eN2EZ/s=

50
main.go
View File

@ -4,21 +4,18 @@ package main
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io"
"io/fs"
"log"
"net"
"net/http"
"os"
"path"
"runtime/debug"
"strconv"
"strings"
"sync"
"time"
"go.balki.me/anyhttp"
"go.balki.me/tglistbot/glist"
)
@ -42,19 +39,12 @@ func main() {
log.Panicln("TGLB_API_TOKEN is empty")
}
port, unixSocketPath := func() (int, string) {
portStr := os.Getenv("TGLB_PORT")
defaultPort := 28923
if strings.HasPrefix(portStr, "unix/") {
return defaultPort, strings.TrimPrefix(portStr, "unix/")
addr := func() string {
addr := os.Getenv("TGLB_PORT")
if addr == "" {
return "28923"
}
if port, err := strconv.Atoi(portStr); err == nil {
return port, ""
}
return defaultPort, ""
return addr
}()
dataPath := func() string {
@ -85,14 +75,7 @@ func main() {
return "unknown"
}()
listeningOn := func() string {
if unixSocketPath != "" {
return fmt.Sprintf("socket: %q", unixSocketPath)
}
return fmt.Sprintf("port: %v", port)
}()
log.Printf("List bot (%s) starting with datapath: %q, %s\n", version, dataPath, listeningOn)
log.Printf("List bot (%s) starting with datapath: %q, %s\n", version, dataPath, addr)
var chats sync.Map
if err := loadData(dataPath, &chats); err != nil {
@ -160,24 +143,7 @@ func main() {
}
})
if unixSocketPath != "" {
// Remove old one
if err := os.Remove(unixSocketPath); err != nil && !errors.Is(err, fs.ErrNotExist) {
log.Panicf("Failed to remove unix socket : %q err: %v\n", unixSocketPath, err)
}
l, err := net.Listen("unix", unixSocketPath)
if err != nil {
log.Panicf("Unable to listen to unix socket : %q err: %v\n", unixSocketPath, err)
}
if err = os.Chmod(unixSocketPath, 0666); err != nil {
log.Panicf("Failed to set permission of unix socket %q err: %v\n", unixSocketPath, err)
}
log.Panicln(http.Serve(l, nil))
}
log.Panicln(http.ListenAndServe(fmt.Sprintf(":%v", port), nil))
log.Panicln(anyhttp.ListenAndServe(addr, nil))
}
func handleTextAdded(gl *glist.GList, text string) {