dirk
/
honk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make the timeouts configurable

This commit is contained in:
Ted Unangst 2022-05-20 12:33:48 -04:00
parent f8fc2c6ef7
commit 47b644e370
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activity.go
View File

@ -46,6 +46,9 @@ var falsenames = []string{
var itiswhatitis = "https://www.w3.org/ns/activitystreams" var itiswhatitis = "https://www.w3.org/ns/activitystreams"
var thewholeworld = "https://www.w3.org/ns/activitystreams#Public" var thewholeworld = "https://www.w3.org/ns/activitystreams#Public"
var fastTimeout time.Duration = 5
var slowTimeout time.Duration = 30
func friendorfoe(ct string) bool { func friendorfoe(ct string) bool {
ct = strings.ToLower(ct) ct = strings.ToLower(ct)
for _, at := range falsenames { for _, at := range falsenames {
@ -80,7 +83,7 @@ func PostMsg(keyname string, key httpsig.PrivateKey, url string, msg []byte) err
req.Header.Set("User-Agent", "honksnonk/5.0; "+serverName) req.Header.Set("User-Agent", "honksnonk/5.0; "+serverName)
req.Header.Set("Content-Type", theonetruename) req.Header.Set("Content-Type", theonetruename)
httpsig.SignRequest(keyname, key, req, msg) httpsig.SignRequest(keyname, key, req, msg)
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute) ctx, cancel := context.WithTimeout(context.Background(), 2*slowTimeout*time.Second)
defer cancel() defer cancel()
req = req.WithContext(ctx) req = req.WithContext(ctx)
resp, err := client.Do(req) resp, err := client.Do(req)
@ -100,11 +103,11 @@ func PostMsg(keyname string, key httpsig.PrivateKey, url string, msg []byte) err
} }
func GetJunk(url string) (junk.Junk, error) { func GetJunk(url string) (junk.Junk, error) {
return GetJunkTimeout(url, 30*time.Second) return GetJunkTimeout(url, slowTimeout*time.Second)
} }
func GetJunkFast(url string) (junk.Junk, error) { func GetJunkFast(url string) (junk.Junk, error) {
return GetJunkTimeout(url, 5*time.Second) return GetJunkTimeout(url, fastTimeout*time.Second)
} }
func GetJunkHardMode(url string) (junk.Junk, error) { func GetJunkHardMode(url string) (junk.Junk, error) {

2
honk.go
View File

@ -320,6 +320,8 @@ func main() {
getconfig("usersep", &userSep) getconfig("usersep", &userSep)
getconfig("honksep", &honkSep) getconfig("honksep", &honkSep)
getconfig("devel", &develMode) getconfig("devel", &develMode)
getconfig("fasttimeout", &fastTimeout)
getconfig("slowtimeout", &slowTimeout)
prepareStatements(db) prepareStatements(db)
switch cmd { switch cmd {
case "admin": case "admin":