Skip to content

Commit

Permalink
Remove nginx reloader, since memory leak seems fixed.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
GUI committed Jul 4, 2018
1 parent ded0792 commit 09b3f74
Show file tree
Hide file tree
Showing 9 changed files with 0 additions and 71 deletions.
33 changes: 0 additions & 33 deletions bin/api-umbrella-nginx-reloader

This file was deleted.

2 changes: 0 additions & 2 deletions build/package/verify/spec/localhost/service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ def install_package(version)
"mongod",
"mora",
"nginx",
"nginx-reloader",
"rsyslog",
"trafficserver",
"web-delayed-job",
Expand All @@ -263,7 +262,6 @@ def install_package(version)
"/opt/api-umbrella/var/log/geoip-auto-updater/current",
"/opt/api-umbrella/var/log/mongod/current",
"/opt/api-umbrella/var/log/mora/current",
"/opt/api-umbrella/var/log/nginx-reloader/current",
"/opt/api-umbrella/var/log/nginx/current",
"/opt/api-umbrella/var/log/perpd/current",
"/opt/api-umbrella/var/log/rsyslog/current",
Expand Down
1 change: 0 additions & 1 deletion config/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ nginx:
size: 20m
upstream_checksums:
size: 200k
_reloader_frequency: 14400 # 4 hours
gatekeeper:
api_key_methods:
- header
Expand Down
1 change: 0 additions & 1 deletion src/api-umbrella/cli/read_config.lua
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,6 @@ local function set_computed_config()
["_service_router_enabled?"] = array_includes(config["services"], "router"),
["_service_auto_ssl_enabled?"] = array_includes(config["services"], "auto_ssl"),
["_service_web_enabled?"] = array_includes(config["services"], "web"),
["_service_nginx_reloader_enabled?"] = (array_includes(config["services"], "router") and config["nginx"]["_reloader_frequency"]),
router = {
trusted_proxies = trusted_proxies,
},
Expand Down
12 changes: 0 additions & 12 deletions src/api-umbrella/cli/reload.lua
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,6 @@ local function reload_dev_env_ember_server(perp_base)
end
end

local function reload_nginx_reloader(perp_base)
local _, _, err = run_command({ "perpctl", "-b", perp_base, "term", "nginx-reloader" })
if err then
print("Failed to reload nginx-reloader\n" .. err)
os.exit(1)
end
end

return function(options)
options["reload"] = nil

Expand All @@ -84,10 +76,6 @@ return function(options)
if config["_service_router_enabled?"] and (is_empty(options) or options["router"]) then
reload_trafficserver(config)
reload_nginx(perp_base)

if config["_service_nginx_reloader_enabled?"] then
reload_nginx_reloader(perp_base)
end
end

if config["app_env"] == "development" then
Expand Down
1 change: 0 additions & 1 deletion src/api-umbrella/cli/setup.lua
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,6 @@ local function activate_services()
active_services["geoip-auto-updater"] = 1
active_services["mora"] = 1
active_services["nginx"] = 1
active_services["nginx-reloader"] = 1
active_services["rsyslog"] = 1
active_services["trafficserver"] = 1
end
Expand Down
2 changes: 0 additions & 2 deletions templates/etc/perp/nginx-reloader/rc.env.mustache

This file was deleted.

3 changes: 0 additions & 3 deletions templates/etc/perp/nginx-reloader/rc.log

This file was deleted.

16 changes: 0 additions & 16 deletions templates/etc/perp/nginx-reloader/rc.main.mustache

This file was deleted.

0 comments on commit 09b3f74

Please sign in to comment.