Allow loading config from a file, load pools

Author: sosedoff

.gitignore

@@ -24,4 +24,5 @@ _testmain.go
 *.prof
 
 bin/*
-languages.json
+languages.json
+config.json

config.go

@@ -1,41 +1,53 @@
 package main
 
 import (
-	"fmt"
+	"encoding/json"
+	"io/ioutil"
 	"os"
 	"time"
 )
 
+type PoolConfig struct {
+	Image    string `json:"image"`
+	Capacity int    `json:"capacity"`
+}
+
 type Config struct {
-	DockerHost          string
-	SharedPath          string
-	RunDuration         time.Duration
-	ThrottleQuota       int
-	ThrottleConcurrency int
-	NetworkDisabled     bool
-	MemoryLimit         int64
+	DockerHost          string        `json:"docker_host"`
+	SharedPath          string        `json:"shared_path"`
+	RunDuration         time.Duration `json:"run_duration"`
+	ThrottleQuota       int           `json:"throttle_quota"`
+	ThrottleConcurrency int           `json:"throttle_concurrency"`
+	NetworkDisabled     bool          `json:"network_disabled"`
+	MemoryLimit         int64         `json:"memory_limit"`
+	Pools               []PoolConfig  `json:"pools"`
 }
 
-func NewConfig() (*Config, error) {
+func NewConfig() *Config {
 	cfg := Config{
 		DockerHost: os.Getenv("DOCKER_HOST"),
 		SharedPath: os.Getenv("SHARED_PATH"),
 	}
 
-	if cfg.DockerHost == "" {
-		return nil, fmt.Errorf("Please set DOCKER_HOST environment variable")
-	}
-
-	if cfg.SharedPath == "" {
-		return nil, fmt.Errorf("Please set SHARED_PATH environment variable")
-	}
-
 	cfg.SharedPath = expandPath(cfg.SharedPath)
 	cfg.RunDuration = time.Second * 10
 	cfg.ThrottleQuota = 5
 	cfg.ThrottleConcurrency = 1
 	cfg.NetworkDisabled = true
 	cfg.MemoryLimit = 67108864
+	cfg.Pools = []PoolConfig{}
+
+	return &cfg
+}
+
+func NewConfigFromFile(path string) (*Config, error) {
+	data, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+
+	config := Config{}
 
-	return &cfg, nil
+	err = json.Unmarshal(data, &config)
+	return &config, err
 }

main.go

@@ -1,13 +1,37 @@
 package main
 
 import (
+	"fmt"
 	"log"
+	"os"
 
 	docker "github.com/fsouza/go-dockerclient"
 )
 
 const VERSION = "0.1.0"
 
+func requireEnvVar(name string) {
+	if os.Getenv(name) == "" {
+		err := fmt.Errorf("Please set %s environment variable", name)
+		log.Fatalln(err)
+	}
+}
+
+func getConfig() *Config {
+	if os.Getenv("CONFIG") != "" {
+		config, err := NewConfigFromFile(os.Getenv("CONFIG"))
+		if err != nil {
+			log.Fatalln(err)
+		}
+
+		return config
+	}
+
+	requireEnvVar("DOCKER_HOST")
+	requireEnvVar("SHARED_PATH")
+	return NewConfig()
+}
+
 func main() {
 	log.Printf("bitrun api v%s\n", VERSION)
 
@@ -16,10 +40,7 @@ func main() {
 		log.Fatalln(err)
 	}
 
-	config, err := NewConfig()
-	if err != nil {
-		log.Fatalln(err)
-	}
+	config := getConfig()
 
 	client, err := docker.NewClient(config.DockerHost)
 	if err != nil {

pool.go

@@ -9,6 +9,8 @@ import (
 	docker "github.com/fsouza/go-dockerclient"
 )
 
+var pools map[string]*Pool
+
 type Pool struct {
 	Config     *Config
 	Client     *docker.Client
@@ -163,4 +165,20 @@ func (pool *Pool) Get() (string, error) {
 }
 
 func RunPool(config *Config, client *docker.Client) {
+	for _, cfg := range config.Pools {
+		log.Println("initializing pool for:", cfg.Image)
+
+		pool, err := NewPool(config, client, cfg.Image, cfg.Capacity)
+		if err != nil {
+			log.Fatalln(err)
+		}
+
+		err = pool.Load()
+		if err != nil {
+			log.Fatalln(err)
+		}
+
+		go pool.Monitor()
+		pools[cfg.Image] = pool
+	}
 }