From 21f75df9a26b14182c9accc9b47ad8992c1e18ec Mon Sep 17 00:00:00 2001
From: Mike Cohen <scudette@users.noreply.github.com>
Date: Mon, 15 Mar 2021 11:45:37 +1000
Subject: [PATCH] Prepare for release 0.5.7 (#973)

---
 config/config.go                   |  4 ++--
 config/validate.go                 |  9 +--------
 gui/velociraptor/src/dark-mode.css |  5 +++++
 server/server.go                   | 12 ++++--------
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/config/config.go b/config/config.go
index 55cec2571f1..1c110dab745 100644
--- a/config/config.go
+++ b/config/config.go
@@ -143,8 +143,8 @@ func GetDefaultConfig() *config_proto.Config {
 			Resources: &config_proto.FrontendResourceControl{
 				ExpectedClients:        10000,
 				ConnectionsPerSecond:   100,
-				Concurrency:            60,
-				TargetHeapSize:         1000000000, // 1Gb
+				Concurrency:            0, // By default 2 * CPU count
+				TargetHeapSize:         0, // Set to control concurrency to match target heap size.
 				NotificationsPerSecond: 10,
 				MaxUploadSize:          constants.MAX_MEMORY * 2,
 			},
diff --git a/config/validate.go b/config/validate.go
index fcd0cfeeb09..7fa2c43ffc9 100644
--- a/config/validate.go
+++ b/config/validate.go
@@ -3,7 +3,6 @@ package config
 import (
 	"fmt"
 	"regexp"
-	"runtime"
 	"strings"
 
 	errors "github.com/pkg/errors"
@@ -49,7 +48,7 @@ func ValidateClientConfig(config_obj *config_proto.Config) error {
 	}
 
 	if config_obj.Client.MaxPoll == 0 {
-		config_obj.Client.MaxPoll = 60
+		config_obj.Client.MaxPoll = 60 // One minute
 	}
 
 	if config_obj.Client.PinnedServerName == "" {
@@ -130,12 +129,6 @@ func ValidateFrontendConfig(config_obj *config_proto.Config) error {
 		resources.ConnectionsPerSecond = 1000
 	}
 
-	// By default concurrency should be about 2 * available CPU
-	// cores.
-	if resources.Concurrency == 0 {
-		resources.Concurrency = 2 * uint64(runtime.GOMAXPROCS(0))
-	}
-
 	if resources.NotificationsPerSecond == 0 {
 		resources.NotificationsPerSecond = 10
 	}
diff --git a/gui/velociraptor/src/dark-mode.css b/gui/velociraptor/src/dark-mode.css
index 0ee1e3de46b..943226ea0b2 100644
--- a/gui/velociraptor/src/dark-mode.css
+++ b/gui/velociraptor/src/dark-mode.css
@@ -336,3 +336,8 @@
 .dark-mode .overlay .fa-spinner {
     filter: invert(1);
 }
+
+/* Shell output */
+.dark-mode .notebook-output pre {
+    filter: invert(1);
+}
diff --git a/server/server.go b/server/server.go
index 817b2720b26..997e577c63f 100644
--- a/server/server.go
+++ b/server/server.go
@@ -192,15 +192,11 @@ func NewServer(config_obj *config_proto.Config) (*Server, error) {
 	}
 
 	heap_size := config_obj.Frontend.Resources.TargetHeapSize
-	if heap_size == 0 {
-		heap_size = 2000000000
-	}
-
-	result.logger.Info("Targetting heap size %v, with maximum concurrency %v",
-		heap_size, concurrency)
+	if heap_size > 0 {
+		// If we are targetting a heap size then modulate concurrency
+		result.logger.Info("Targetting heap size %v, with maximum concurrency %v",
+			heap_size, concurrency)
 
-	// If we are targetting a heap size then modulate concurrency
-	if config_obj.Frontend.Resources.TargetHeapSize > 0 {
 		go result.ManageConcurrency(concurrency, heap_size)
 	}