From c4dc1fda2461e7ec4d219810f31d079b539d3e27 Mon Sep 17 00:00:00 2001 From: Shahen Hovhannisyan Date: Sun, 30 Jun 2024 01:44:49 +0400 Subject: [PATCH 1/2] fix(Disconnect): Cleanup jobs after disconnect --- domain/jobs/manager.go | 2 +- pkg/actor/actor_impl.go | 2 +- pkg/actor/register_job.go | 4 +--- pkg/jobs/manager_impl.go | 10 ++-------- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/domain/jobs/manager.go b/domain/jobs/manager.go index 9d0e41b..a84c560 100644 --- a/domain/jobs/manager.go +++ b/domain/jobs/manager.go @@ -4,6 +4,6 @@ type JobsManager interface { Add(peerId string, delay uint64, isPeriodic bool) string Get(id string) (Job, bool) Cancel(id string) - Jobs() []Job + Jobs() *map[string]Job Chan() <-chan Job } diff --git a/pkg/actor/actor_impl.go b/pkg/actor/actor_impl.go index 366ec55..cf6dd57 100644 --- a/pkg/actor/actor_impl.go +++ b/pkg/actor/actor_impl.go @@ -51,7 +51,7 @@ func (actor *Actor) DisconnectPeer(peer connection.Peer) { actor.peers.Remove(peer) jobs := actor.jobs.Jobs() - for _, job := range jobs { + for _, job := range *jobs { if job.PeerId() == peer.ID() { actor.jobs.Cancel(job.ID()) } diff --git a/pkg/actor/register_job.go b/pkg/actor/register_job.go index 16a29ba..ec9cd00 100644 --- a/pkg/actor/register_job.go +++ b/pkg/actor/register_job.go @@ -13,7 +13,5 @@ func (actor *Actor) RegisterJob(peer connection.Peer, query command.JobCommand) logger.Info(fmt.Sprintf("Job registered with id %s", id)) - reply := fmt.Sprintf("%s %s", query.ID(), id) - - query.ReplyOK(peer.Conn(), reply) + query.ReplyOK(peer.Conn(), id) } diff --git a/pkg/jobs/manager_impl.go b/pkg/jobs/manager_impl.go index 7991aa2..61f266d 100644 --- a/pkg/jobs/manager_impl.go +++ b/pkg/jobs/manager_impl.go @@ -43,12 +43,6 @@ func (jm *JobsManager) Chan() <-chan job.Job { return jm.triggerChan } -func (jm *JobsManager) Jobs() []job.Job { - jobs := make([]job.Job, len(jm.jobs)) - - for _, job := range jm.jobs { - jobs = append(jobs, job) - } - - return jobs +func (jm *JobsManager) Jobs() *map[string]mJob.Job { + return &jm.jobs } From 7f790cc0ccb053d6a09018204209db7c22917e2a Mon Sep 17 00:00:00 2001 From: Shahen Hovhannisyan Date: Sun, 30 Jun 2024 01:45:17 +0400 Subject: [PATCH 2/2] chore(version): Bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 227cea2..38f77a6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0 +2.0.1