Skip to content

Commit f89adf5

Browse files
iaymerichiaymerich
committed
chore: lint fixes
1 parent f22ce8d commit f89adf5

File tree

2 files changed

+49
-52
lines changed

2 files changed

+49
-52
lines changed

‎worker/serverclient/server_client.go‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -42,24 +42,24 @@ func NewServerClient(webServerConfig *web.Config, workerName string) *ServerClie
4242
}
4343
}
4444

45-
func (Q *ServerClient) PublishEvent(event model.TaskEvent) error {
46-
event.WorkerName = Q.workerName
45+
func (s *ServerClient) PublishEvent(event model.TaskEvent) error {
46+
event.WorkerName = s.workerName
4747
b, err := json.Marshal(event)
4848
if err != nil {
4949
return err
5050
}
51-
req, err := Q.request("POST", "/api/v1/event", bytes.NewBuffer(b))
51+
req, err := s.request("POST", "/api/v1/event", bytes.NewBuffer(b))
5252
if err != nil {
5353
fmt.Printf("Error creating request: %v\n", err)
5454
return err
5555
}
5656

57-
resp, err := Q.httpClient.Do(req)
57+
resp, err := s.httpClient.Do(req)
5858
if err != nil {
5959
return err
6060
}
6161
if resp.StatusCode != 200 {
62-
return errors.New(fmt.Sprintf("Error publishing event: %s", resp.Status))
62+
return fmt.Errorf("error publishing event: %s", resp.Status)
6363
}
6464
defer resp.Body.Close()
6565

@@ -68,13 +68,13 @@ func (Q *ServerClient) PublishEvent(event model.TaskEvent) error {
6868

6969
var NoJobAvailable = errors.New("no job available")
7070

71-
func (Q *ServerClient) RequestJob(workerName string) (*model.TaskEncode, error) {
72-
req, err := Q.request("GET", "/api/v1/job/request", nil)
73-
req.Header.Set("workerName", workerName)
71+
func (s *ServerClient) RequestJob(workerName string) (*model.TaskEncode, error) {
72+
req, err := s.request("GET", "/api/v1/job/request", nil)
7473
if err != nil {
7574
return nil, err
7675
}
77-
resp, err := Q.httpClient.Do(req)
76+
req.Header.Set("workerName", workerName)
77+
resp, err := s.httpClient.Do(req)
7878
if err != nil {
7979
return nil, err
8080
}
@@ -84,7 +84,7 @@ func (Q *ServerClient) RequestJob(workerName string) (*model.TaskEncode, error)
8484
}
8585

8686
if resp.StatusCode != http.StatusOK {
87-
return nil, errors.New(fmt.Sprintf("Error requesting job: %s", resp.Status))
87+
return nil, fmt.Errorf("error requesting job: %s", resp.Status)
8888
}
8989

9090
body, err := io.ReadAll(resp.Body)
@@ -99,42 +99,46 @@ func (Q *ServerClient) RequestJob(workerName string) (*model.TaskEncode, error)
9999
return job, nil
100100
}
101101

102-
func (Q *ServerClient) GetDownloadURL(id uuid.UUID) string {
103-
return fmt.Sprintf("%s?uuid=%s", Q.GetURL("/api/v1/download"), id.String())
102+
func (s *ServerClient) GetDownloadURL(id uuid.UUID) string {
103+
return fmt.Sprintf("%s?uuid=%s", s.GetURL("/api/v1/download"), id.String())
104104
}
105105

106-
func (Q *ServerClient) GetChecksumURL(id uuid.UUID) string {
107-
return fmt.Sprintf("%s?uuid=%s", Q.GetURL("/api/v1/checksum"), id.String())
106+
func (s *ServerClient) GetChecksumURL(id uuid.UUID) string {
107+
return fmt.Sprintf("%s?uuid=%s", s.GetURL("/api/v1/checksum"), id.String())
108108
}
109109

110-
func (Q *ServerClient) GetUploadURL(id uuid.UUID) string {
111-
return fmt.Sprintf("%s?uuid=%s", Q.GetURL("/api/v1/upload"), id.String())
110+
func (s *ServerClient) GetUploadURL(id uuid.UUID) string {
111+
return fmt.Sprintf("%s?uuid=%s", s.GetURL("/api/v1/upload"), id.String())
112112
}
113113

114-
func (Q *ServerClient) GetURL(uri string) string {
115-
return fmt.Sprintf("%s%s", Q.webServerConfig.Domain, uri)
114+
func (s *ServerClient) GetURL(uri string) string {
115+
return fmt.Sprintf("%s%s", s.webServerConfig.Domain, uri)
116116
}
117117

118-
func (Q *ServerClient) request(method string, uri string, body io.Reader) (*http.Request, error) {
119-
req, err := http.NewRequest(method, Q.GetURL(uri), body)
118+
func (s *ServerClient) request(method string, uri string, body io.Reader) (*http.Request, error) {
119+
req, err := http.NewRequest(method, s.GetURL(uri), body)
120120
if err != nil {
121121
fmt.Printf("Error creating request: %v\n", err)
122122
return nil, err
123123
}
124124

125-
authHeader := fmt.Sprintf("Bearer %s", Q.webServerConfig.Token)
125+
authHeader := fmt.Sprintf("Bearer %s", s.webServerConfig.Token)
126126
req.Header.Set("Content-Type", "application/json")
127127
req.Header.Set("Authorization", authHeader)
128128

129129
return req, nil
130130
}
131131

132-
func (Q *ServerClient) PublishPing() error {
132+
func (s *ServerClient) PublishPing() error {
133+
publicIp, err := helper.GetPublicIP()
134+
if err != nil {
135+
return err
136+
}
133137
pingEvent := model.TaskEvent{
134138
EventType: model.PingEvent,
135-
WorkerName: Q.workerName,
139+
WorkerName: s.workerName,
136140
EventTime: time.Now(),
137-
IP: helper.GetPublicIP(),
141+
IP: publicIp,
138142
}
139-
return Q.PublishEvent(pingEvent)
143+
return s.PublishEvent(pingEvent)
140144
}

‎worker/task/coordinator.go‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package task
33
import (
44
"context"
55
"errors"
6-
"github.com/google/uuid"
76
log "github.com/sirupsen/logrus"
87
"os"
98
"sync"
@@ -23,12 +22,6 @@ type ServerCoordinator struct {
2322
updater *update.Updater
2423
}
2524

26-
type JobWorker struct {
27-
jobID uuid.UUID
28-
active bool
29-
encodeWorker *EncodeWorker
30-
}
31-
3225
func NewServerCoordinator(serverClient *serverclient.ServerClient, worker *EncodeWorker, updater *update.Updater, printer *ConsoleWorkerPrinter) *ServerCoordinator {
3326
coordinator := &ServerCoordinator{
3427
serverClient: serverClient,
@@ -39,73 +32,73 @@ func NewServerCoordinator(serverClient *serverclient.ServerClient, worker *Encod
3932
return coordinator
4033
}
4134

42-
func (Q *ServerCoordinator) Run(wg *sync.WaitGroup, ctx context.Context) {
35+
func (q *ServerCoordinator) Run(wg *sync.WaitGroup, ctx context.Context) {
4336
log.Info("starting server coordinator")
44-
Q.start(ctx)
37+
q.start(ctx)
4538
log.Info("started server coordinator")
4639
wg.Add(1)
4740
go func() {
4841
<-ctx.Done()
4942
log.Info("stopping server coordinator")
50-
Q.stop()
43+
q.stop()
5144
wg.Done()
5245
}()
5346
}
5447

55-
func (Q *ServerCoordinator) start(ctx context.Context) {
56-
go Q.heartbeatRoutine(ctx)
57-
go Q.requestTaskRoutine(ctx)
48+
func (q *ServerCoordinator) start(ctx context.Context) {
49+
go q.heartbeatRoutine(ctx)
50+
go q.requestTaskRoutine(ctx)
5851
}
59-
func (Q *ServerCoordinator) stop() {
52+
func (q *ServerCoordinator) stop() {
6053
log.Info("waiting for jobs to cancel")
6154
}
6255

63-
func (Q *ServerCoordinator) connection() {
56+
func (q *ServerCoordinator) connection() {
6457

6558
}
6659

67-
func (Q *ServerCoordinator) heartbeatRoutine(ctx context.Context) {
60+
func (q *ServerCoordinator) heartbeatRoutine(ctx context.Context) {
6861
//Declare Worker Unique ServerCoordinator
6962

7063
for {
7164
select {
7265
case <-ctx.Done():
7366
return
7467
case <-time.After(time.Second * 30):
75-
if err := Q.serverClient.PublishPing(); err != nil {
76-
Q.printer.Error("Error Publishing Ping Event: %v", err)
68+
if err := q.serverClient.PublishPing(); err != nil {
69+
q.printer.Error("Error Publishing Ping Event: %v", err)
7770
}
7871
}
7972
}
8073
}
8174

82-
func (Q *ServerCoordinator) requestTaskRoutine(ctx context.Context) {
75+
func (q *ServerCoordinator) requestTaskRoutine(ctx context.Context) {
8376
for {
8477
select {
8578
case <-ctx.Done():
8679
return
8780
case <-time.After(time.Second * 5):
88-
if Q.worker.AcceptJobs() {
89-
release, requireUpdate, err := Q.updater.CheckForUpdate()
81+
if q.worker.AcceptJobs() {
82+
release, requireUpdate, err := q.updater.CheckForUpdate()
9083
if err != nil {
91-
Q.printer.Error("Error Checking For Update: %v", err)
84+
q.printer.Error("Error Checking For Update: %v", err)
9285
continue
9386
}
9487
if requireUpdate {
95-
Q.printer.Log("New version available %s,exiting ...", release.TagName)
88+
q.printer.Log("New version available %s,exiting ...", release.TagName)
9689
os.Exit(update.ExitCode)
9790
}
9891

99-
taskJob, err := Q.serverClient.RequestJob(Q.worker.GetName())
92+
taskJob, err := q.serverClient.RequestJob(q.worker.GetName())
10093
if err != nil {
10194
if !errors.Is(err, serverclient.NoJobAvailable) {
102-
Q.printer.Error("Error Requesting Job: %v", err)
95+
q.printer.Error("Error Requesting Job: %v", err)
10396
}
10497
continue
10598
}
10699

107-
if err := Q.worker.Execute(taskJob); err != nil {
108-
Q.printer.Error("Error Preparing Job Execution: %v", err)
100+
if err := q.worker.Execute(taskJob); err != nil {
101+
q.printer.Error("Error Preparing Job Execution: %v", err)
109102
}
110103
}
111104
}

0 commit comments

Comments
 (0)