fix: remove non-errors

.ansible/files/ev.service

@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 ExecStart=/usr/local/bin/ev
-
+User=www-data
 Restart=always
 RestartSec=30
 

.ansible/playbook.yml

@@ -10,12 +10,12 @@
       owner: root 
       group: root
 
-  - name: Copy build to remote
+  # - name: Copy build to remote
-    ansible.builtin.copy:
+  #   ansible.builtin.copy:
-      src: ev.service
+  #     src: ev.service
-      dest: /etc/systemd/system/ev.service 
+  #     dest: /etc/systemd/system/ev.service 
-      owner: root 
+  #     owner: root 
-      group: root
+  #     group: root
 
   - name: Restart service
     systemd:

.gitea/workflows/bump-push.yml

@@ -0,0 +1,25 @@
+name: Go Bump
+
+on: 
+  push:
+    branches: [ "main" ]
+
+jobs:
+  bump:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        fetch-tags: true
+    
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.21.1
+
+    - run: go install github.com/psanetra/git-semver/cli@master
+
+    - run: git tag v$(cli next --stable=false) && git push --tags || echo no change
+
+    - run: echo "🍏 This job's status is ${{ job.status }}."

.gitea/workflows/bump.yml

@@ -1,28 +1,30 @@
 name: Go Bump
 
 on: 
-  # workflow_dispatch:
+  workflow_dispatch:
-  #   inputs:
+    inputs:
-  #     stable:
+      NAME:
-  #         description: 'Stable Release'
+        description: "A random input name for the workflow"
-  #         required: false
+        type: string
-  #         type: boolean
+      SOME_VALUE:
-  #     prerelease:
+        description: "Some other input to pass"
-  #         description: 'Pre Release'
+        type: string
-  #         required: false
+
-  #         type: boolean
+  # push:
-  push:
+  #   branches: [ "main" ]
-    branches: [ "main" ]
+  # pull_request:
-  pull_request:
+  #   branches: [ "main" ]
-    branches: [ "main" ]
 
 jobs:
   bump:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        fetch-tags: true
     
-    - run: echo stable=${{ inputs.stable }} pre=${{ inputs.prerelease }}
+    - run: echo stable=${{ inputs.STABLE }} pre=${{ inputs.BETA }}
 
     - name: Set up Go
       uses: actions/setup-go@v3

.gitea/workflows/deploy.yml

@@ -1,8 +1,8 @@
 name: Deploy
 
 on:
-  # push:
+  push:
-  #   branches: [ "main" ]
+    branches: [ "main" ]
   release:
     types: [ published ]
 
@@ -11,6 +11,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:    
     - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+        fetch-tags: true
 
     - run: apt-get update && apt-get -y install ansible
 

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.RecordError(err)
+		span.AddEvent(err.Error())
 		w.WriteHeader(http.StatusNotFound)
 		return
 	}
@@ -204,8 +204,9 @@ 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.RecordError(fmt.Errorf("peer not found: %w", err))
+		span.AddEvent("peer not found")
 		w.WriteHeader(http.StatusNotFound)
+		return
 	}
 
 	var req *Request
@@ -221,8 +222,9 @@ func (s *service) getPending(w http.ResponseWriter, r *http.Request, peerID stri
 		}
 	}
 	if req == nil {
-		span.RecordError(fmt.Errorf("request not found"))
+		span.AddEvent("request not found")
 		w.WriteHeader(http.StatusNoContent)
+		return
 	}
 
 	negotiator := contentnegotiation.NewNegotiator("application/json", "text/environment", "text/plain", "text/html")
@@ -304,7 +306,7 @@ func (s *service) getResults(w http.ResponseWriter, r *http.Request) {
 	sort.Sort(sort.Reverse(requests))
 
 	args := requestArgs(r)
-	args.Requests = requests[:maxResults]
+	args.Requests = requests[:min(maxResults, len(requests))]
 
 	s.state.Use(ctx, func(ctx context.Context, state *state) error {
 		args.CountPeers = len(state.peers)
@@ -451,6 +453,7 @@ func (s *service) postResult(w http.ResponseWriter, r *http.Request, reqID strin
 	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(subReq.Close(ctx), subRes.Close(ctx), err)
+		err = multierr.Combine(err, subReq.Close(ctx), subRes.Close(ctx))
 	}()
 
-	if errs != nil {
-		return errs
-	}
-
 	for {
 		var events event.Events
 		select {

cmd/ev/main.go

@@ -4,10 +4,13 @@ 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"
 )
@@ -27,6 +30,13 @@ 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)