From e58c0891ff31c77eeb43db26ff570100b93af30c Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 28 Jun 2017 17:06:07 +0200 Subject: [PATCH 1/6] Rename config variable "db_pool" to "db_pool_max_size" --- config/config.rb | 2 +- config/initializers/database.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.rb b/config/config.rb index 17e6d19..bcece06 100644 --- a/config/config.rb +++ b/config/config.rb @@ -26,7 +26,7 @@ module Config # Override -- value is returned or the set default. override :database_timeout, 10, int - override :db_pool, 5, int + override :db_pool_max_size, 5, int override :deployment, 'production', string override :elastic_prefix, 'sirius', string override :force_ssl, true, bool diff --git a/config/initializers/database.rb b/config/initializers/database.rb index 8e9f2c9..8ded67d 100644 --- a/config/initializers/database.rb +++ b/config/initializers/database.rb @@ -7,7 +7,7 @@ # while Sequel expects 'postgres' adapter db_url = Config.database_url.sub(/\Apostgresql:/, 'postgres:') -DB = Sequel.connect(db_url, max_connections: Config.db_pool) +DB = Sequel.connect(db_url, max_connections: Config.db_pool_max_size) # Log level at which to log SQL queries. DB.sql_log_level = :debug From 307b0d9b8f6f279adaa2809e41760a37f4e73679 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 28 Jun 2017 17:06:42 +0200 Subject: [PATCH 2/6] Change default value of "db_pool_max_size" to 3 --- config/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.rb b/config/config.rb index bcece06..56dc8a1 100644 --- a/config/config.rb +++ b/config/config.rb @@ -26,7 +26,7 @@ module Config # Override -- value is returned or the set default. override :database_timeout, 10, int - override :db_pool_max_size, 5, int + override :db_pool_max_size, 3, int override :deployment, 'production', string override :elastic_prefix, 'sirius', string override :force_ssl, true, bool From d13e5fe889e478d1870313853273a316db3694d7 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 28 Jun 2017 17:08:37 +0200 Subject: [PATCH 3/6] Rename config variable "timeout" to "rack_timeout" --- .env.sample | 2 +- config/config.rb | 2 +- config/initializers/timeout.rb | 4 ++-- lib/routes.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env.sample b/.env.sample index f2fd0c9..49ec8fe 100644 --- a/.env.sample +++ b/.env.sample @@ -4,6 +4,6 @@ RACK_ENV=development TZ=Europe/Prague RAISE_ERRORS=true FORCE_SSL=false -TIMEOUT=false +RACK_TIMEOUT=false DOMAIN=example.com SYNC_SCHEDULE=0 */12 * * * diff --git a/config/config.rb b/config/config.rb index 56dc8a1..2e4aa52 100644 --- a/config/config.rb +++ b/config/config.rb @@ -41,7 +41,7 @@ module Config override :rack_env, 'development', string override :raise_errors, false, bool override :root, File.expand_path('../', __dir__), string - override :timeout, 10, int + override :rack_timeout, 10, int override :tz, 'Europe/Prague', string override :versioning, false, bool diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb index 4f42b04..b3f3d16 100644 --- a/config/initializers/timeout.rb +++ b/config/initializers/timeout.rb @@ -1,5 +1,5 @@ require 'rack-timeout' -if Config.timeout > 0 - Rack::Timeout.timeout = Config.timeout +if Config.rack_timeout > 0 + Rack::Timeout.timeout = Config.rack_timeout end diff --git a/lib/routes.rb b/lib/routes.rb index 109eabc..b08e2b4 100644 --- a/lib/routes.rb +++ b/lib/routes.rb @@ -3,7 +3,7 @@ Routes = Rack::Builder.new do use Pliny::Middleware::RescueErrors, raise: Config.raise_errors? use Pliny::Middleware::CORS - use Rack::Timeout if Config.timeout > 0 + use Rack::Timeout if Config.rack_timeout > 0 use Raven::Rack if Config.sentry_dsn use Rack::Deflater use Rack::MethodOverride From ae18d14fd667e6d70f2ea5c00449e0cb49130464 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 28 Jun 2017 17:21:22 +0200 Subject: [PATCH 4/6] Make Rack::Timeout less chatty, set its log level to WARN --- config/initializers/timeout.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/initializers/timeout.rb b/config/initializers/timeout.rb index b3f3d16..a27cd74 100644 --- a/config/initializers/timeout.rb +++ b/config/initializers/timeout.rb @@ -1,5 +1,7 @@ +require 'logger' require 'rack-timeout' if Config.rack_timeout > 0 Rack::Timeout.timeout = Config.rack_timeout + Rack::Timeout::Logger.level = Logger::WARN end From 90f4673bcdaa863247c7139e2dcdca5b8ea90523 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 28 Jun 2017 17:24:15 +0200 Subject: [PATCH 5/6] Change default "umapi_privileged_roles" to B-00000-SUMA-ZAMESTNANEC --- config/config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.rb b/config/config.rb index 2e4aa52..b5a001c 100644 --- a/config/config.rb +++ b/config/config.rb @@ -34,7 +34,7 @@ module Config override :oauth_auth_uri, 'https://auth.fit.cvut.cz/oauth/authorize', string override :oauth_token_uri, 'https://auth.fit.cvut.cz/oauth/token', string override :umapi_people_uri, 'https://kosapi.fit.cvut.cz/usermap/v1/people', string - override :umapi_privileged_roles, 'B-00000-ZAMESTNANEC', array(string) + override :umapi_privileged_roles, 'B-00000-SUMA-ZAMESTNANEC', array(string) override :port, 5000, int override :pretty_json, false, bool From facec938d84709111a4272bb6f7f308f38c4ada9 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Wed, 28 Jun 2017 18:22:29 +0200 Subject: [PATCH 6/6] Remove redundant trailing newlines from some files --- Rakefile | 3 --- vagga.yaml | 1 - 2 files changed, 4 deletions(-) diff --git a/Rakefile b/Rakefile index 4d1d776..76ce904 100644 --- a/Rakefile +++ b/Rakefile @@ -3,6 +3,3 @@ require 'pliny/tasks' Dir['./lib/tasks/*.rake'].each { |task| load task } task :default => :spec - - - diff --git a/vagga.yaml b/vagga.yaml index 5016888..1a4e74a 100644 --- a/vagga.yaml +++ b/vagga.yaml @@ -96,4 +96,3 @@ commands: children: postgres: *postgres elastic: *elastic -