Merge pull request #44 from OlgaMinyaeva/master

move to config fix_node timeout  value

Author: Andrei Skomorkhov

config/config.go

@@ -20,12 +20,14 @@ type Config struct {
 
 // Grid general settings
 type Grid struct {
-	ClientType       string     `json:"client_type"`
-	Port             int        `json:"port"`
-	StrategyList     []Strategy `json:"strategy_list"`
-	BusyNodeDuration string     `json:"busy_node_duration"` // duration string format ex. 12m, see time.ParseDuration()
+	ClientType   string     `json:"client_type"`
+	Port         int        `json:"port"`
+	StrategyList []Strategy `json:"strategy_list"`
+	// duration string format ex. 12m, see time.ParseDuration()
+	BusyNodeDuration string `json:"busy_node_duration"`
 	// todo: выпилить и сделать равным дедлайну http запроса
-	ReservedDuration string `json:"reserved_node_duration"` // duration string format ex. 12m, see time.ParseDuration()
+	ReservedDuration string `json:"reserved_node_duration"`
+	FixNodeTimeout   string `json:"fix_node_timeout,omitempty"`
 }
 
 // Strategy - Describes the algorithm of node selection.
@@ -63,9 +65,19 @@ type Statsd struct {
 	CapabilitiesList []metrics.CapabilitiesSelector `json:"selectors"`
 }
 
-// New - Constructor of config.
+// New - Constructor of config with default values
 func New() *Config {
-	return &Config{}
+	return &Config{Logger: Logger{Level: "debug"},
+		DB: DB{Implementation: "local"},
+		Grid: Grid{
+			ClientType:       "selenium",
+			Port:             4444,
+			StrategyList:     []Strategy{{Type: "persistent"}},
+			ReservedDuration: "5m",
+			BusyNodeDuration: "15m",
+			FixNodeTimeout:   "5m",
+		},
+	}
 }
 
 // LoadFromFile - config loader from json file.

main.go

@@ -44,6 +44,10 @@ func main() {
 	if err != nil {
 		log.Fatal("Invalid value grid.reserved_node_duration in config")
 	}
+	fixNodeDuration, err := time.ParseDuration(cfg.Grid.FixNodeTimeout)
+	if err != nil {
+		log.Fatal("Invalid value grid.fix_node_timeout in config")
+	}
 	storageFactory, err := invokeStorageFactory(*cfg)
 	if err != nil {
 		log.Fatalf("Can't invoke storage factory, %s", err)
@@ -80,7 +84,7 @@ func main() {
 	go func() {
 		for {
 			poolInstance.FixNodeStatuses()
-			time.Sleep(time.Minute * 5) // todo: move to config
+			time.Sleep(fixNodeDuration)
 		}
 	}()