accept more noauth codes from ntg

broker/job.go

@@ -2,6 +2,7 @@ package broker
 
 import (
 	"fmt"
+	"local/truckstop/config"
 	"time"
 )
 
@@ -37,7 +38,8 @@ func (j JobLocation) String() string {
 
 func (j Job) FormatMultilineText() string {
 	return fmt.Sprintf(
-		"--- %s => %s ---\nPickup: %s\nDropoff: %s\nNotes: %d lbs, %d miles, %s",
+		"--- %s: %s => %s ---\nPickup: %s\nDropoff: %s\nNotes: %d lbs, %d miles, %s",
+		config.Get().Name,
 		j.Pickup.State,
 		j.Dropoff.State,
 		j.Pickup.String(),

broker/ntgvision.go

@@ -146,7 +146,7 @@ func (ntg NTGVision) _search(states []config.State) (io.ReadCloser, error) {
 	if resp.StatusCode != http.StatusOK {
 		b, _ := ioutil.ReadAll(resp.Body)
 		resp.Body.Close()
-		if resp.StatusCode > 400 && resp.StatusCode < 404 {
+		if resp.StatusCode > 400 && resp.StatusCode < 500 && resp.StatusCode != 404 && resp.StatusCode != 410 {
 			return nil, ErrNoAuth
 		}
 		return nil, fmt.Errorf("bad status searching ntg: %d: %s", resp.StatusCode, b)

config.json

@@ -1,7 +1,9 @@
 {
+   "Name": "pa",
    "Interval": {
       "OK": "6h0m0s",
-      "Error": "6h"
+      "Error": "6h",
+      "Email": "15m"
    },
    "States": [
       "GA"

config/config.go

@@ -10,7 +10,9 @@ import (
 )
 
 type Config struct {
+	Name     string
 	Interval struct {
+		Email Duration
 		OK    Duration
 		Error Duration
 	}

main.go

@@ -21,16 +21,15 @@ var stateFinder = regexp.MustCompile(`[A-Za-z]+`)
 func main() {
 	lock := &sync.Mutex{}
 	go func() {
-		c := time.NewTicker(time.Minute)
+		for {
-		for range c.C {
+			time.Sleep(config.Get().Interval.Email.Get())
-			if !config.Get().EmailerEnabled {
+			if config.Get().EmailerEnabled {
-				continue
+				lock.Lock()
+				if err := email(); err != nil {
+					log.Print(err)
+				}
+				lock.Unlock()
 			}
-			lock.Lock()
-			if err := email(); err != nil {
-				log.Print(err)
-			}
-			lock.Unlock()
 		}
 	}()
 	if err := _main(); err != nil {
@@ -111,12 +110,15 @@ func _main() error {
 }
 
 func _mainOne() error {
+	log.Println("config.refreshing...")
 	if err := config.Refresh(); err != nil {
 		return err
 	}
+	log.Println("once...")
 	if err := once(); err != nil {
 		return err
 	}
+	log.Println("/_mainOne")
 	return nil
 }
 
@@ -137,6 +139,7 @@ func once() error {
 		if err := sendJob(jobs[i]); err != nil {
 			return err
 		}
+		log.Println("sent job", jobs[i])
 		if err := config.Get().DB().Set(jobs[i].ID, []byte(`sent`)); err != nil {
 			return err
 		}

todo.yaml

@@ -3,8 +3,13 @@ todo:
   subtasks:
   - banlist criteria like vendors, brokers, metadata
 - quiet hours
-- setup pa on element
+- setup ma on element
+- accept states via element for one system
+- set up copy for caleb, broc
 done:
+- setup pa on element
+- configurable email interval
+- jitter on intervals, including dedicated err span
 - email doesnt get all matches
 - send jobs
 - read jobs