--- a/util/startup.lua	Mon Jun 15 14:23:47 2020 +0100
+++ b/util/startup.lua	Mon Jun 15 14:16:34 2020 +0100
@@ -12,6 +12,8 @@
 
 local original_logging_config;
 
+local default_gc_params = { mode = "incremental", threshold = 105, speed = 250 };
+
 local short_params = { D = "daemonize", F = "no-daemonize" };
 local value_params = { config = true };
 
@@ -544,6 +546,19 @@
 	end
 end
 
+function startup.init_gc()
+	-- Apply garbage collector settings from the config file
+	local gc = require "util.gc";
+	local gc_settings = config.get("*", "gc") or { mode = default_gc_params.mode };
+
+	local ok, err = gc.configure(gc_settings, default_gc_params);
+	if not ok then
+		log("error", "Failed to apply GC configuration: %s", err);
+		return nil, err;
+	end
+	return true;
+end
+
 function startup.make_host(hostname)
 	return {
 		type = "local",
@@ -573,6 +588,7 @@
 	startup.read_config();
 	startup.force_console_logging();
 	startup.init_logging();
+	startup.init_gc();
 	startup.setup_plugindir();
 	startup.setup_datadir();
 	startup.chdir();
@@ -593,6 +609,7 @@
 	startup.init_global_state();
 	startup.read_config();
 	startup.init_logging();
+	startup.init_gc();
 	startup.sanity_check();
 	startup.sandbox_require();
 	startup.set_function_metatable();