Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a5780449fc | |||
| 4784c1c380 | |||
| 6bb1d524b9 | |||
| bcadac0f07 | |||
| 1a2087f2ee | |||
| f2069de1ec |
@@ -5,7 +5,7 @@ After=syslog.target network.target
|
|||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
ExecStart=/usr/local/bin/ev
|
ExecStart=/usr/local/bin/ev
|
||||||
|
User=www-data
|
||||||
Restart=always
|
Restart=always
|
||||||
RestartSec=30
|
RestartSec=30
|
||||||
|
|
||||||
|
|||||||
@@ -10,12 +10,12 @@
|
|||||||
owner: root
|
owner: root
|
||||||
group: 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
|
- name: Restart service
|
||||||
systemd:
|
systemd:
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ jobs:
|
|||||||
|
|
||||||
- run: go install github.com/psanetra/git-semver/cli@master
|
- run: go install github.com/psanetra/git-semver/cli@master
|
||||||
|
|
||||||
- run: git tag v$(cli next --stable=false)
|
- run: git tag v$(cli next --stable=false) && git push --tags || echo no change
|
||||||
- run: git push --tags
|
|
||||||
|
|
||||||
- run: echo "🍏 This job's status is ${{ job.status }}."
|
- run: echo "🍏 This job's status is ${{ job.status }}."
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
name: Deploy
|
name: Deploy
|
||||||
|
|
||||||
on:
|
on:
|
||||||
# push:
|
push:
|
||||||
# branches: [ "main" ]
|
branches: [ "main" ]
|
||||||
release:
|
release:
|
||||||
types: [ published ]
|
types: [ published ]
|
||||||
create:
|
|
||||||
types: [ tag ]
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
|
|||||||
@@ -304,7 +304,7 @@ func (s *service) getResults(w http.ResponseWriter, r *http.Request) {
|
|||||||
sort.Sort(sort.Reverse(requests))
|
sort.Sort(sort.Reverse(requests))
|
||||||
|
|
||||||
args := requestArgs(r)
|
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 {
|
s.state.Use(ctx, func(ctx context.Context, state *state) error {
|
||||||
args.CountPeers = len(state.peers)
|
args.CountPeers = len(state.peers)
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ func (s *service) Run(ctx context.Context) (err error) {
|
|||||||
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
|
|
||||||
err = multierr.Combine(subReq.Close(ctx), subRes.Close(ctx), err)
|
err = multierr.Combine(errs, subReq.Close(ctx), subRes.Close(ctx))
|
||||||
}()
|
}()
|
||||||
|
|
||||||
if errs != nil {
|
if errs != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user