Merge pull request #69 from XDagger/develop

Develop
XDagger · Aug 22, 2023 · 972a9b3 · 972a9b3
2 parents c669b0e + ce39d01
commit 972a9b3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/server/main.go b/server/main.go
@@ -20,7 +20,7 @@ import (
 // }
 
 var (
-	version = "2.0.6"
+	version = "2.0.7"
 
 	// cmd line options
 	configFile *string

diff --git a/server/proxy/proxy.go b/server/proxy/proxy.go
@@ -234,11 +234,20 @@ func (p *Proxy) handleJob(job *Job) (err error) {
 
 // broadcast a job to all workers
 func (p *Proxy) broadcastJob() {
+	p.connMu.Lock()
+	defer p.connMu.Unlock()
+	if p.isClosed {
+		return
+	}
+
 	logger.Get().Debugln("Broadcasting new job to connected workers.")
 	//for _, w := range p.workers {
 	//	go w.NewJob(p.NextJob())
 	//}
-	p.worker.NewJob(p.currentJob)
+	if p.worker != nil {
+		p.worker.NewJob(p.currentJob)
+	}
+
 }
 
 func (p *Proxy) handleNotification(notif []byte) {
@@ -471,6 +480,12 @@ func (p *Proxy) Close() {
 // }
 
 func (p *Proxy) handleSubmit(s *share) (err error) {
+	p.connMu.Lock()
+	defer p.connMu.Unlock()
+	if p.isClosed {
+		return
+	}
+
 	defer func() {
 		close(s.Response)
 		close(s.Error)