.ansible/playbook.yml

@@ -5,7 +5,7 @@
   tasks:
   - name: Copy build to remote
     ansible.builtin.copy:
-      src: ../ev
+      src: ../build/ev
       dest: /usr/local/bin/ev 
       owner: root 
       group: root

.gitea/workflows/deploy.yml

@@ -9,8 +9,12 @@ on:
 jobs:
   deploy:
     runs-on: ubuntu-latest
-    steps:
+    steps:    
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        fetch-tags: true
+
     - run: apt-get update && apt-get -y install ansible
 
     - name: Set up Go
@@ -18,17 +22,15 @@ jobs:
       with:
         go-version: 1.21.1
 
-    - name: Install
-      run: go install -ldflags "-s -w" go.sour.is/tools/cmd/ev@main
-
-    - run: mv $(go env GOPATH)/bin/ev ev
+    - name: Build
+      run: go build -ldflags "-s -w" -o ./build/ev ./cmd/ev
 
     - name: Compress
       uses: https://git.sour.is/actions/ghaction-upx@v2.4.0
       with:
         version: latest
         files: |
-            ./ev
+            ./build/ev
         args: -fq
 
     - name: Deploy

.gitignore

@@ -1,2 +1 @@
 tools
-sour.is-tools

Makefile

@@ -1,6 +1,6 @@
 export PATH:=$(shell go env GOPATH)/bin:$(PATH)
 export EV_DATA=mem:
-export EV_HTTP=:8085
+export EV_HTTP=:8080
 export WEBFINGER_DOMAINS=localhost
 
 .DEFAULT_GOAL := air
@@ -15,7 +15,7 @@ endif
 	air .
 
 run:
-	go build  -buildvcs=true -o sour.is-tools ./cmd/ev && ./sour.is-tools
+	go build . && ./tools
 
 test:
 	go test -cover -race ./...

app/peerfinder/http.go

@@ -179,7 +179,7 @@ func (s *service) getPending(w http.ResponseWriter, r *http.Request, peerID stri
 		return nil
 	})
 	if err != nil {
-		span.AddEvent(err.Error())
+		span.RecordError(err)
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
@@ -204,9 +204,8 @@ func (s *service) getPending(w http.ResponseWriter, r *http.Request, peerID stri
 	peerResults.SetStreamID(aggPeer(peerID))
 	err = s.es.Load(ctx, peerResults)
 	if err != nil && !errors.Is(err, ev.ErrNotFound) {
-		span.AddEvent("peer not found")
+		span.RecordError(fmt.Errorf("peer not found: %w", err))
 		w.WriteHeader(http.StatusNotFound)
-		return
 	}
 
 	var req *Request
@@ -222,9 +221,8 @@ func (s *service) getPending(w http.ResponseWriter, r *http.Request, peerID stri
 		}
 	}
 	if req == nil {
-		span.AddEvent("request not found")
+		span.RecordError(fmt.Errorf("request not found"))
 		w.WriteHeader(http.StatusNoContent)
-		return
 	}
 
 	negotiator := contentnegotiation.NewNegotiator("application/json", "text/environment", "text/plain", "text/html")
@@ -435,8 +433,8 @@ func (s *service) postResult(w http.ResponseWriter, r *http.Request, reqID strin
 	err := s.state.Use(ctx, func(ctx context.Context, state *state) error {
 		var ok bool
 		if _, ok = state.peers[peerID]; !ok {
-			log.Printf("peer not found: req=%s peer=%s\n", reqID, peerID)
-			return fmt.Errorf("peer not found: req=%s peer=%s", reqID, peerID)
+			log.Printf("peer not found: %s\n", peerID)
+			return fmt.Errorf("peer not found: %s", peerID)
 		}
 
 		return nil
@@ -450,10 +448,9 @@ func (s *service) postResult(w http.ResponseWriter, r *http.Request, reqID strin
 	peerResults := &PeerResults{}
 	peerResults.SetStreamID(aggPeer(peerID))
 	err = s.es.Load(ctx, peerResults)
-	if err != nil && !errors.Is(err, ev.ErrNotFound) {
-		span.RecordError(fmt.Errorf("peer not found: req=%s peer=%s %w", reqID, peerID, err))
+	if err != nil {
+		span.RecordError(fmt.Errorf("peer not found: %w", err))
 		w.WriteHeader(http.StatusNotFound)
-		return
 	}
 
 	if peerResults.Has(reqID) {

app/peerfinder/service.go

@@ -91,17 +91,17 @@ func (s *service) Run(ctx context.Context) (err error) {
 	subRes, e := s.es.EventStream().Subscribe(ctx, queueResults, 0)
 	errs = multierr.Append(errs, e)
 
-	if errs != nil {
-		return errs
-	}
-
 	defer func() {
 		ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
 		defer cancel()
 
-		err = multierr.Combine(err, subReq.Close(ctx), subRes.Close(ctx))
+		err = multierr.Combine(errs, subReq.Close(ctx), subRes.Close(ctx))
 	}()
 
+	if errs != nil {
+		return errs
+	}
+
 	for {
 		var events event.Events
 		select {

cmd/ev/main.go

@@ -4,13 +4,10 @@ import (
 	"context"
 	"errors"
 	"log"
-	"log/slog"
 	"net/http"
 	"os"
 	"os/signal"
-	"strconv"
 
-	"go.sour.is/pkg/env"
 	"go.sour.is/pkg/lg"
 	"go.sour.is/pkg/service"
 )
@@ -30,13 +27,6 @@ func main() {
 	}
 }
 func run(ctx context.Context) error {
-	// TODO: make this configurable.
-	level := slog.LevelError
-	if ok, _ := strconv.ParseBool(env.Default("LOG_DEBUG", "FALSE")); ok {
-		level = slog.LevelDebug
-	}
-	slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})))
-
 	svc := &service.Harness{}
 	ctx, stop := lg.Init(ctx, appName)
 	svc.OnStop(stop)

main.go

@@ -1,3 +1,4 @@
+// <script src="https://unpkg.com/htmx.org@1.9.2" integrity="sha384-L6OqL9pRWyyFU3+/bjdSri+iIphTN/bvYyM37tICVyOJkWZLpP2vGn6VUEXgzg6h" crossorigin="anonymous"></script>
 package main
 
 import (