Merge branch 'staging' of https://github.com/FarmBot/Farmbot-Web-App into staging

Author: roryaronson

Procfile

@@ -1,5 +1,5 @@
 worker:         bundle exec rake jobs:work
 rabbit_workers: bin/rails r lib/rabbit_workers.rb
-web:            bundle exec passenger start -p $PORT -e $RAILS_ENV --max-pool-size $MAX_POOL_SIZE
+web:            bundle exec passenger start -p $PORT -e $RAILS_ENV --max-pool-size ${MAX_POOL_SIZE:-1} --max-requests ${MAX_REQUESTS:-1000}
 # This will perform a hard refresh on all connected browsers.
 release:        rails r "User.refresh_everyones_ui" && rails db:migrate && (bundle exec rake hook:release_info || true)

docker-compose.yml

@@ -50,7 +50,7 @@ services:
     build:
       context: "."
       dockerfile: docker_configs/api.Dockerfile
-    command: bash -c "rm -f tmp/pids/server.pid && bundle exec passenger start"
+    command: bash -c "rm -f tmp/pids/server.pid && bundle exec passenger start --max-pool-size ${MAX_POOL_SIZE:-1} --max-requests ${MAX_REQUESTS:-1000}"
     ports: ["${API_PORT}:${API_PORT}"]
 
   mqtt:

example.env

@@ -142,7 +142,12 @@ CODECOV_TOKEN=
 
 # Set the max pool size for Passenger. (Only needed if using Heroku)
 # FarmBot Inc uses Heroku. Self hosters do not.
-MAX_POOL_SIZE=2
+MAX_POOL_SIZE=1
+
+# Set the max number of requests until restart for Passenger.
+# (Only needed if using Heroku)
+# FarmBot Inc uses Heroku. Self hosters do not.
+MAX_REQUESTS=1000
 
 # This is set by Heroku and used by the frontend to show the current version.
 # Most self hosting users will want to delete this.