little

broker/fastexact.go

@@ -87,7 +87,7 @@ func (fe FastExact) _login(username, password string, db storage.DB) error {
 		return err
 	}
 	b, _ := ioutil.ReadAll(resp.Body)
-	defer resp.Body.Close()
+	resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("bad status logging into fast exact: %d: %s", resp.StatusCode, b)
@@ -152,7 +152,6 @@ func (fe FastExact) searchOneZip(zip string) ([]Job, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
 	return fe.parse(resp)
 }
 
@@ -166,7 +165,6 @@ func (fe FastExact) searchOneState(state config.State) ([]Job, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
 	return fe.parse(resp)
 }
 

broker/ntgvision.go

@@ -374,9 +374,6 @@ func (ntg NTGVision) _searchStates(states []config.State) (io.ReadCloser, error)
 	if err != nil {
 		return nil, err
 	}
-	defer resp.Body.Close()
-	b, _ := ioutil.ReadAll(resp.Body)
-	resp.Body = io.NopCloser(bytes.NewReader(b))
 	if resp.StatusCode != http.StatusOK {
 		b, _ := ioutil.ReadAll(resp.Body)
 		resp.Body.Close()

main.go

@@ -126,9 +126,7 @@ func matrixrecv() error {
 				logtr.Errorf("failed to mark state gathered @%s: %v", key, err)
 			}
 		}
-		if config.Get().Brokers.UseZips {
-			setNewZips(zips)
-		}
+		setNewZips(zips)
 	}()
 	func() {
 		logtr.Verbosef("looking for states")
@@ -152,9 +150,7 @@ func matrixrecv() error {
 				logtr.Errorf("failed to mark state gathered @%s: %v", key, err)
 			}
 		}
-		if !config.Get().Brokers.UseZips {
-			setNewStates(states)
-		}
+		setNewStates(states)
 	}()
 	func() {
 		logtr.Verbosef("looking for radius")
@@ -526,12 +522,15 @@ func updateDeadJobs(jobs []broker.Job) error {
 				return err
 			}
 			*/
+			if err := message.NewMatrix().Remove(recorded.MatrixID); err != nil {
+				logtr.Debugf("failed to remove matrix: %v: %v", recorded.MatrixID, err)
+			}
 			if err := db.Set(listEntry, nil); err != nil {
 				logtr.Debugf("failed to remove db: %v: %v", listEntry, err)
 			}
 			for _, imageid := range recorded.MatrixImageIDs {
-				if err := message.NewMatrix().Update(imageid, "<job no longer available>"); err != nil {
-					logtr.Debugf("failed to update matrix image: %v: %v", imageid, err)
+				if err := message.NewMatrix().Remove(imageid); err != nil {
+					logtr.Debugf("failed to remove matrix image: %v: %v", imageid, err)
 				}
 			}
 		}

message/images.go

@@ -64,7 +64,7 @@ func uploadImage(b []byte) (string, error) {
 	request.Header.Set("Authorization", "Bearer "+images.AccessToken)
 	request.Header.Set("Content-Type", writer.FormDataContentType())
 
-	c := &http.Client{Timeout: time.Minute * 5}
+	c := &http.Client{Timeout: time.Minute}
 	response, err := c.Do(request)
 	if err != nil {
 		return "", err

message/matrix.go

@@ -2,7 +2,6 @@ package message
 
 import (
 	"bytes"
-	"crypto/tls"
 	"fmt"
 	"io/ioutil"
 	"local/truckstop/config"
@@ -45,28 +44,8 @@ func newMatrix(conf config.Matrix, cont string) Matrix {
 	}
 }
 
-func (m Matrix) closeclient(client *gomatrix.Client) {
-	go func() {
-		client.Client.CloseIdleConnections()
-		client.StopSync()
-		client.Logout()
-	}()
-}
-
 func (m Matrix) getclient() (*gomatrix.Client, error) {
-	client, err := gomatrix.NewClient(m.homeserver, m.username, m.token)
-	if err != nil {
-		return nil, err
-	}
-	client.Client = &http.Client{
-		Timeout: time.Minute * 5,
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-		},
-	}
-	return client, nil
+	return gomatrix.NewClient(m.homeserver, m.username, m.token)
 }
 
 func (m Matrix) Continuation() string {
@@ -100,7 +79,6 @@ func (m *Matrix) Receive() ([]Message, error) {
 	if err != nil {
 		return nil, err
 	}
-	defer m.closeclient(c)
 	messages := make([]Message, 0)
 	result, err := c.Messages(m.room, "999999999999999999", m.Continuation(), 'b', 50)
 	if err != nil {
@@ -156,7 +134,6 @@ func (m Matrix) Remove(id string) error {
 	if err != nil {
 		return err
 	}
-	defer m.closeclient(c)
 	_, err = c.RedactEvent(m.room, id, &gomatrix.ReqRedact{Reason: "stale"})
 	return err
 }
@@ -170,7 +147,6 @@ func (m Matrix) Update(id, text string) error {
 	if err != nil {
 		return err
 	}
-	defer m.closeclient(c)
 	type MRelatesTo struct {
 		EventID string `json:"event_id"`
 		RelType string `json:"rel_type"`
@@ -214,7 +190,6 @@ func (m Matrix) SendTracked(text string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	defer m.closeclient(c)
 	resp, err := c.SendText(m.room, text)
 	if err != nil {
 		return "", err
@@ -250,7 +225,6 @@ func (m Matrix) SendImageTracked(uri string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	defer m.closeclient(c)
 	mediaUpload, err := c.UploadToContentRepo(bytes.NewReader(b), "image/jpeg", int64(len(b)))
 	if err != nil {
 		return "", err