Merge pull request #25 from vania-pooh/master

Added --limit flag (fixes #23)

cmd/selenoid.go

@@ -27,6 +27,7 @@ var (
 	skipDownload    bool
 	vnc             bool
 	force           bool
+	limit           int
 )
 
 func init() {
@@ -77,7 +78,12 @@ func initFlags() {
 	} {
 		c.Flags().BoolVarP(&force, "force", "f", false, "force action")
 	}
-
+	for _, c := range []*cobra.Command{
+		selenoidStartCmd,
+		selenoidUpdateCmd,
+	} {
+		c.Flags().IntVarP(&limit, "limit", "m", 0, "max parallel sessions limit (-limit parameter in Selenoid)")
+	}
 }
 
 func createLifecycle() (*selenoid.Lifecycle, error) {
@@ -87,6 +93,7 @@ func createLifecycle() (*selenoid.Lifecycle, error) {
 		ConfigDir: configDir,
 		Browsers:  browsers,
 		Download:  !skipDownload,
+		Limit:     limit,
 
 		LastVersions: lastVersions,
 		RegistryUrl:  registry,

selenoid/base.go

@@ -62,3 +62,7 @@ type DownloadAware struct {
 type RequestedBrowsersAware struct {
 	Browsers string
 }
+
+type LimitAware struct {
+	Limit int
+}

selenoid/docker.go

@@ -15,6 +15,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
+	"github.com/docker/docker/api/types/strslice"
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/heroku/docker-registry-client/registry"
@@ -42,6 +43,7 @@ type DockerConfigurator struct {
 	VersionAware
 	DownloadAware
 	RequestedBrowsersAware
+	LimitAware
 	LastVersions int
 	Pull         bool
 	RegistryUrl  string
@@ -58,6 +60,7 @@ func NewDockerConfigurator(config *LifecycleConfig) (*DockerConfigurator, error)
 		VersionAware:           VersionAware{Version: config.Version},
 		DownloadAware:          DownloadAware{DownloadNeeded: config.Download},
 		RequestedBrowsersAware: RequestedBrowsersAware{Browsers: config.Browsers},
+		LimitAware:             LimitAware{Limit: config.Limit},
 		RegistryUrl:            config.RegistryUrl,
 		LastVersions:           config.LastVersions,
 		Tmpfs:                  config.Tmpfs,
@@ -396,13 +399,21 @@ func (c *DockerConfigurator) Start() error {
 		volumes = append(volumes, fmt.Sprintf("%s:%s", dockerSocket, dockerSocket))
 	}
 	ctx := context.Background()
+	containerConfig := container.Config{
+		Hostname:     "localhost",
+		Image:        image.RepoTags[0],
+		Env:          env,
+		ExposedPorts: exposedPorts,
+	}
+	cmd := []string{}
+	if c.Limit > 0 {
+		cmd = append(cmd, "-limit", string(c.Limit))
+	}
+	if len(cmd) > 0 {
+		containerConfig.Cmd = strslice.StrSlice(cmd)
+	}
 	ctr, err := c.docker.ContainerCreate(ctx,
-		&container.Config{
-			Hostname:     "localhost",
-			Image:        image.RepoTags[0],
-			Env:          env,
-			ExposedPorts: exposedPorts,
-		},
+		&containerConfig,
 		&container.HostConfig{
 			Binds:        volumes,
 			PortBindings: portBindings,

selenoid/docker_test.go

@@ -211,6 +211,7 @@ func testConfigure(t *testing.T, download bool) {
 			LastVersions: 2,
 			Tmpfs:        512,
 			Browsers:     "firefox,opera",
+			Limit:        42,
 		}
 		c, err := NewDockerConfigurator(&lcConfig)
 		AssertThat(t, err, Is{nil})

selenoid/drivers.go

@@ -61,6 +61,7 @@ type DriversConfigurator struct {
 	ConfigDirAware
 	VersionAware
 	DownloadAware
+	LimitAware
 	RequestedBrowsersAware
 	Browsers        string
 	BrowsersJsonUrl string
@@ -75,6 +76,7 @@ func NewDriversConfigurator(config *LifecycleConfig) *DriversConfigurator {
 		Logger:                 Logger{Quiet: config.Quiet},
 		ConfigDirAware:         ConfigDirAware{ConfigDir: config.ConfigDir},
 		VersionAware:           VersionAware{Version: config.Version},
+		LimitAware:             LimitAware{Limit: config.Limit},
 		DownloadAware:          DownloadAware{DownloadNeeded: config.Download},
 		RequestedBrowsersAware: RequestedBrowsersAware{Browsers: config.Browsers},
 		BrowsersJsonUrl:        config.BrowsersJsonUrl,
@@ -463,10 +465,14 @@ func (d *DriversConfigurator) IsRunning() bool {
 }
 
 func (d *DriversConfigurator) Start() error {
-	return runCommand(d.getSelenoidBinaryPath(), []string{
+	args := []string{
 		"-conf", getSelenoidConfigPath(d.ConfigDir),
 		"-disable-docker",
-	})
+	}
+	if d.Limit > 0 {
+		args = append(args, "-limit", string(d.Limit))
+	}
+	return runCommand(d.getSelenoidBinaryPath(), args)
 }
 
 var killFunc func(os.Process) error = func(p os.Process) error {

selenoid/drivers_test.go

@@ -373,6 +373,7 @@ func TestStartStopProcess(t *testing.T) {
 			OS:            runtime.GOOS,
 			Arch:          runtime.GOARCH,
 			Version:       Latest,
+			Limit:         42,
 		}
 		configurator := NewDriversConfigurator(&lcConfig)
 		AssertThat(t, configurator.IsRunning(), Is{true})

selenoid/lifecycle.go

@@ -13,6 +13,7 @@ type LifecycleConfig struct {
 	ConfigDir string
 	Browsers  string
 	Download  bool
+	Limit     int
 
 	// Docker specific
 	LastVersions int