Skip to content

Commit 09b3f74

Browse files
committed
Remove nginx reloader, since memory leak seems fixed.
I'm not exactly sure what fixed it, but I think between removing some of the third party nginx modules, and removing global variables and pre-loading all the lua modules, the memory growth seems to be fixed, so we no longer need to periodically reload nginx.
1 parent ded0792 commit 09b3f74

File tree

9 files changed

+0
-71
lines changed

9 files changed

+0
-71
lines changed

bin/api-umbrella-nginx-reloader

Lines changed: 0 additions & 33 deletions
This file was deleted.

build/package/verify/spec/localhost/service_spec.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ def install_package(version)
244244
"mongod",
245245
"mora",
246246
"nginx",
247-
"nginx-reloader",
248247
"rsyslog",
249248
"trafficserver",
250249
"web-delayed-job",
@@ -263,7 +262,6 @@ def install_package(version)
263262
"/opt/api-umbrella/var/log/geoip-auto-updater/current",
264263
"/opt/api-umbrella/var/log/mongod/current",
265264
"/opt/api-umbrella/var/log/mora/current",
266-
"/opt/api-umbrella/var/log/nginx-reloader/current",
267265
"/opt/api-umbrella/var/log/nginx/current",
268266
"/opt/api-umbrella/var/log/perpd/current",
269267
"/opt/api-umbrella/var/log/rsyslog/current",

config/default.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ nginx:
5050
size: 20m
5151
upstream_checksums:
5252
size: 200k
53-
_reloader_frequency: 14400 # 4 hours
5453
gatekeeper:
5554
api_key_methods:
5655
- header

src/api-umbrella/cli/read_config.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,6 @@ local function set_computed_config()
407407
["_service_router_enabled?"] = array_includes(config["services"], "router"),
408408
["_service_auto_ssl_enabled?"] = array_includes(config["services"], "auto_ssl"),
409409
["_service_web_enabled?"] = array_includes(config["services"], "web"),
410-
["_service_nginx_reloader_enabled?"] = (array_includes(config["services"], "router") and config["nginx"]["_reloader_frequency"]),
411410
router = {
412411
trusted_proxies = trusted_proxies,
413412
},

src/api-umbrella/cli/reload.lua

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,6 @@ local function reload_dev_env_ember_server(perp_base)
5454
end
5555
end
5656

57-
local function reload_nginx_reloader(perp_base)
58-
local _, _, err = run_command({ "perpctl", "-b", perp_base, "term", "nginx-reloader" })
59-
if err then
60-
print("Failed to reload nginx-reloader\n" .. err)
61-
os.exit(1)
62-
end
63-
end
64-
6557
return function(options)
6658
options["reload"] = nil
6759

@@ -84,10 +76,6 @@ return function(options)
8476
if config["_service_router_enabled?"] and (is_empty(options) or options["router"]) then
8577
reload_trafficserver(config)
8678
reload_nginx(perp_base)
87-
88-
if config["_service_nginx_reloader_enabled?"] then
89-
reload_nginx_reloader(perp_base)
90-
end
9179
end
9280

9381
if config["app_env"] == "development" then

src/api-umbrella/cli/setup.lua

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ local function activate_services()
267267
active_services["geoip-auto-updater"] = 1
268268
active_services["mora"] = 1
269269
active_services["nginx"] = 1
270-
active_services["nginx-reloader"] = 1
271270
active_services["rsyslog"] = 1
272271
active_services["trafficserver"] = 1
273272
end

templates/etc/perp/nginx-reloader/rc.env.mustache

Lines changed: 0 additions & 2 deletions
This file was deleted.

templates/etc/perp/nginx-reloader/rc.log

Lines changed: 0 additions & 3 deletions
This file was deleted.

templates/etc/perp/nginx-reloader/rc.main.mustache

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)