From 3e0375962cd0b57c2766b8ee825479c0df7ff95a Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <sk@skylup.com>
Date: Mon, 5 Sep 2022 00:39:26 +0700
Subject: [PATCH 1/2] Chore: lock puma to 4.x version

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a609b17..38f4b40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ end
 
 group :framework do
   gem 'sinatra', '>= 1.3'
-  gem 'puma'
+  gem 'puma', '4.3.12'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 75f19e0..8f33cf4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     net-http-persistent (2.9.4)
     nio4r (2.5.8)
-    puma (5.6.4)
+    puma (4.3.12)
       nio4r (~> 2.0)
     rack (2.2.3.1)
     rack-mini-profiler (2.3.3)
@@ -122,7 +122,7 @@ DEPENDENCIES
   maruku
   memory_profiler
   net-http-persistent (~> 2.0)
-  puma
+  puma (= 4.3.12)
   rack-mini-profiler
   rack-test
   rake

From 53fbe2092fab2caf9d4ea05773e8a4659b7c5e3f Mon Sep 17 00:00:00 2001
From: "Stanislav (Stas) Katkov" <sk@skylup.com>
Date: Mon, 5 Sep 2022 12:36:09 +0700
Subject: [PATCH 2/2] stop daemonizing puma

---
 Gemfile         | 2 +-
 Gemfile.lock    | 4 ++--
 README.md       | 6 +-----
 Rakefile        | 5 -----
 scripts/puma.rb | 1 -
 5 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 38f4b40..a609b17 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ end
 
 group :framework do
   gem 'sinatra', '>= 1.3'
-  gem 'puma', '4.3.12'
+  gem 'puma'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f33cf4..c4843c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -54,7 +54,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     net-http-persistent (2.9.4)
     nio4r (2.5.8)
-    puma (4.3.12)
+    puma (5.6.5)
       nio4r (~> 2.0)
     rack (2.2.3.1)
     rack-mini-profiler (2.3.3)
@@ -122,7 +122,7 @@ DEPENDENCIES
   maruku
   memory_profiler
   net-http-persistent (~> 2.0)
-  puma (= 4.3.12)
+  puma
   rack-mini-profiler
   rack-test
   rake
diff --git a/README.md b/README.md
index 25b82f5..d6009e1 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,7 @@ bundle exec rake gems:update
 bundle exec rake server:start
 ```
 
-This will start a daemonized process, you can stop the server with:
-
-```sh
-bundle exec rake server:stop
-```
+You can access application page at http://localhost:8080/ now. 
 
 ### Running With Docker
 
diff --git a/Rakefile b/Rakefile
index 79705ff..bf9c582 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,11 +21,6 @@ namespace :server do
   task :restart => 'cache:clean_index' do
     sh "kill -USR1 `cat tmp/pids/server.pid`"
   end
-
-  desc 'Shut down the server'
-  task :stop do
-    sh "kill -9 `cat tmp/pids/server.pid`"
-  end
 end
 
 namespace :gems do
diff --git a/scripts/puma.rb b/scripts/puma.rb
index f0be36c..bd51648 100644
--- a/scripts/puma.rb
+++ b/scripts/puma.rb
@@ -6,7 +6,6 @@
 rackup root + 'config.ru'
 environment 'production'
 bind 'tcp://0.0.0.0:8080'
-daemonize unless ENV['DOCKERIZED']
 pidfile root + 'tmp/pids/server.pid'
 unless ENV['DOCKERIZED']
   stdout_redirect root + 'log/puma.log', root + 'log/puma.err.log', true