IntenseWebs/boringproxy
3
0
Fork 0
mirror of https://github.com/boringproxy/boringproxy.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reduce number of client panics

Browse Source
This commit is contained in:
Anders Pitman 2020-10-10 10:04:37 -06:00
parent eb4d6903c7
commit 6d6c0b46bc
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client.go
View File

@ -3,6 +3,7 @@ package main
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"errors"
"flag" "flag"
"fmt" "fmt"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
@ -55,17 +56,20 @@ func NewBoringProxyClient() *BoringProxyClient {
func (c *BoringProxyClient) RunPuppetClient() { func (c *BoringProxyClient) RunPuppetClient() {
for { for {
c.PollTunnels() err := c.PollTunnels()
if err != nil {
log.Print(err)
}
time.Sleep(2 * time.Second) time.Sleep(2 * time.Second)
} }
} }
func (c *BoringProxyClient) PollTunnels() { func (c *BoringProxyClient) PollTunnels() error {
url := fmt.Sprintf("https://%s/api/tunnels?client-name=%s", c.server, c.clientName) url := fmt.Sprintf("https://%s/api/tunnels?client-name=%s", c.server, c.clientName)
listenReq, err := http.NewRequest("GET", url, nil) listenReq, err := http.NewRequest("GET", url, nil)
if err != nil { if err != nil {
log.Fatal("Failed making request", err) return err
} }
if len(c.token) > 0 { if len(c.token) > 0 {
@ -74,12 +78,12 @@ func (c *BoringProxyClient) PollTunnels() {
resp, err := c.httpClient.Do(listenReq) resp, err := c.httpClient.Do(listenReq)
if err != nil { if err != nil {
log.Fatal("Failed listen request", err) return err
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != 200 { if resp.StatusCode != 200 {
log.Fatal("Failed to listen (not 200 status)") return errors.New("Failed to listen (not 200 status)")
} }
etag := resp.Header["Etag"][0] etag := resp.Header["Etag"][0]
@ -92,7 +96,7 @@ func (c *BoringProxyClient) PollTunnels() {
err = json.Unmarshal(body, &tunnels) err = json.Unmarshal(body, &tunnels)
if err != nil { if err != nil {
log.Fatal("Failed to parse response", err) return err
} }
c.SyncTunnels(tunnels) c.SyncTunnels(tunnels)
@ -100,6 +104,7 @@ func (c *BoringProxyClient) PollTunnels() {
c.previousEtag = etag c.previousEtag = etag
} }
return nil
} }
func (c *BoringProxyClient) SyncTunnels(serverTunnels map[string]Tunnel) { func (c *BoringProxyClient) SyncTunnels(serverTunnels map[string]Tunnel) {