about summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-09-02T22·32+0100
committerVincent Ambo <github@tazj.in>2019-09-02T22·44+0100
commit32b9b5099eaeabc5672b6236e26743736b85cc41 (patch)
tree7a052247418c997190f9af7760fc607f929bca41 /tools
parentce8635833b226df8497be34a8009d0e47cb0399e (diff)
feat(server): Add configuration option for Nix build timeouts
Adds a NIX_TIMEOUT environment variable which can be set to a number
of seconds that is the maximum allowed time each Nix builder can run.

By default this is set to 60 seconds, which should be plenty for most
use-cases as Nixery is not expected to be performing builds of
uncached binaries in most production cases.

Currently the errors Nix throws on a build timeout are not separated
from other types of errors, meaning that users will see a generic 500
server error in case of a timeout.

This fixes #47
Diffstat (limited to 'tools')
-rw-r--r--tools/nixery/server/builder/builder.go1
-rw-r--r--tools/nixery/server/config/config.go16
2 files changed, 11 insertions, 6 deletions
diff --git a/tools/nixery/server/builder/builder.go b/tools/nixery/server/builder/builder.go
index a249384d9fef..35a2c2f71283 100644
--- a/tools/nixery/server/builder/builder.go
+++ b/tools/nixery/server/builder/builder.go
@@ -119,6 +119,7 @@ func BuildImage(ctx *context.Context, cfg *config.Config, cache *BuildCache, ima
 		}
 
 		args := []string{
+			"--timeout", cfg.Timeout,
 			"--argstr", "name", image.Name,
 			"--argstr", "packages", string(packages),
 		}
diff --git a/tools/nixery/server/config/config.go b/tools/nixery/server/config/config.go
index 4e3b70dcdc22..5fba0e658ae0 100644
--- a/tools/nixery/server/config/config.go
+++ b/tools/nixery/server/config/config.go
@@ -102,10 +102,12 @@ func signingOptsFromEnv() *storage.SignedURLOptions {
 	}
 }
 
-func getConfig(key, desc string) string {
+func getConfig(key, desc, def string) string {
 	value := os.Getenv(key)
-	if value == "" {
+	if value == "" && def == "" {
 		log.Fatalln(desc + " must be specified")
+	} else if value == "" {
+		return def
 	}
 
 	return value
@@ -117,15 +119,17 @@ type Config struct {
 	Signing *storage.SignedURLOptions // Signing options to use for GCS URLs
 	Port    string                    // Port on which to launch HTTP server
 	Pkgs    *PkgSource                // Source for Nix package set
-	WebDir  string
+	Timeout string                    // Timeout for a single Nix builder (seconds)
+	WebDir  string                    // Directory with static web assets
 }
 
 func FromEnv() *Config {
 	return &Config{
-		Bucket:  getConfig("BUCKET", "GCS bucket for layer storage"),
-		Port:    getConfig("PORT", "HTTP port"),
+		Bucket:  getConfig("BUCKET", "GCS bucket for layer storage", ""),
+		Port:    getConfig("PORT", "HTTP port", ""),
 		Pkgs:    pkgSourceFromEnv(),
 		Signing: signingOptsFromEnv(),
-		WebDir:  getConfig("WEB_DIR", "Static web file dir"),
+		Timeout: getConfig("NIX_TIMEOUT", "Nix builder timeout", "60"),
+		WebDir:  getConfig("WEB_DIR", "Static web file dir", ""),
 	}
 }