Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
49bb6cbaea | |||
38318f5dc6 | |||
db72c24de3 | |||
87170420e4 | |||
2e79ac4460 |
@ -5,7 +5,7 @@
|
||||
tasks:
|
||||
- name: Copy build to remote
|
||||
ansible.builtin.copy:
|
||||
src: ../build/ev
|
||||
src: ../ev
|
||||
dest: /usr/local/bin/ev
|
||||
owner: root
|
||||
group: root
|
||||
|
@ -9,12 +9,8 @@ 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
|
||||
@ -22,15 +18,17 @@ jobs:
|
||||
with:
|
||||
go-version: 1.21.1
|
||||
|
||||
- name: Build
|
||||
run: go build -ldflags "-s -w" -o ./build/ev ./cmd/ev
|
||||
- name: Install
|
||||
run: go install -ldflags "-s -w" go.sour.is/tools/cmd/ev@main
|
||||
|
||||
- run: mv $(go env GOPATH)/bin/ev ev
|
||||
|
||||
- name: Compress
|
||||
uses: https://git.sour.is/actions/ghaction-upx@v2.4.0
|
||||
with:
|
||||
version: latest
|
||||
files: |
|
||||
./build/ev
|
||||
./ev
|
||||
args: -fq
|
||||
|
||||
- name: Deploy
|
||||
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
tools
|
||||
sour.is-tools
|
||||
|
4
Makefile
4
Makefile
@ -1,6 +1,6 @@
|
||||
export PATH:=$(shell go env GOPATH)/bin:$(PATH)
|
||||
export EV_DATA=mem:
|
||||
export EV_HTTP=:8080
|
||||
export EV_HTTP=:8085
|
||||
export WEBFINGER_DOMAINS=localhost
|
||||
|
||||
.DEFAULT_GOAL := air
|
||||
@ -15,7 +15,7 @@ endif
|
||||
air .
|
||||
|
||||
run:
|
||||
go build . && ./tools
|
||||
go build -buildvcs=true -o sour.is-tools ./cmd/ev && ./sour.is-tools
|
||||
|
||||
test:
|
||||
go test -cover -race ./...
|
||||
|
@ -435,8 +435,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: %s\n", peerID)
|
||||
return fmt.Errorf("peer not found: %s", peerID)
|
||||
log.Printf("peer not found: req=%s peer=%s\n", reqID, peerID)
|
||||
return fmt.Errorf("peer not found: req=%s peer=%s", reqID, peerID)
|
||||
}
|
||||
|
||||
return nil
|
||||
@ -450,8 +450,8 @@ 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 {
|
||||
span.RecordError(fmt.Errorf("peer not found: %w", err))
|
||||
if err != nil && !errors.Is(err, ev.ErrNotFound) {
|
||||
span.RecordError(fmt.Errorf("peer not found: req=%s peer=%s %w", reqID, peerID, err))
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
return
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user