fix: null pointer when unable to startu peerfinder

.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/deploy.yml

@@ -1,6 +1,8 @@
 name: Deploy
 
 on:
+  push:
+    branches: [ "main" ]
   release:
     types: [ published ]
 

app/peerfinder/http.go

@@ -304,7 +304,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)

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(errs, subReq.Close(ctx), subRes.Close(ctx))
+		err = multierr.Combine(err, subReq.Close(ctx), subRes.Close(ctx))
 	}()
 
-	if errs != nil {
-		return errs
-	}
-
 	for {
 		var events event.Events
 		select {