Correctly initializing uploaders after parsing flags (related to aero…

…kube#583)
vania-pooh · Nov 16, 2018 · cc0fc73 · cc0fc73
1 parent 257648e
commit cc0fc73
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -25,7 +25,7 @@ import (
 	"github.com/aerokube/selenoid/protect"
 	"github.com/aerokube/selenoid/service"
 	"github.com/aerokube/selenoid/session"
-	_ "github.com/aerokube/selenoid/upload"
+	"github.com/aerokube/selenoid/upload"
 	"github.com/aerokube/util"
 	"github.com/aerokube/util/docker"
 	"github.com/docker/docker/client"
@@ -174,6 +174,8 @@ func init() {
 		log.Printf("[-] [INIT] [Logs Dir: %s]", logOutputDir)
 	}
 
+	upload.Init()
+
 	environment := service.Environment{
 		InDocker:             inDocker,
 		CPU:                  int64(cpu),

diff --git a/upload/uploader.go b/upload/uploader.go
@@ -4,7 +4,6 @@ import (
 	"github.com/aerokube/selenoid/event"
 	"github.com/aerokube/util"
 	"log"
-	"sync"
 	"time"
 )
 
@@ -18,17 +17,21 @@ type Uploader interface {
 
 type Upload struct {
 	uploaders []Uploader
-	lock      sync.Mutex
+}
+
+func Init() {
+	if upl != nil {
+		for _, upl := range upl.uploaders {
+			event.InitIfNeeded(upl)
+		}
+	}
 }
 
 func AddUploader(u Uploader) {
 	if upl == nil {
 		upl = &Upload{}
 		event.AddFileCreatedListener(upl)
 	}
-	upl.lock.Lock()
-	defer upl.lock.Unlock()
-	event.InitIfNeeded(u)
 	upl.uploaders = append(upl.uploaders, u)
 }