Merge pull request #357 from ytti/fix/349-puma-process-name

Stop puma from renaming the process and reacting on signals

Author: robertcheramy

.gitignore

@@ -53,3 +53,4 @@ Gemfile.lock
 # npm files
 /node_modules/
 /.rake_tasks~
+.vscode/settings.json

CHANGELOG.md

@@ -12,7 +12,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Update weblibs to the latest version
 
 ### Fixed
-
+- Run puma directly, so that it does not rename the oxidized process.
+  Fixes: 349 (@robertcheramy)
 
 ## [0.16.0 - 2025-03-25]
 This release introduces the possibility for an extended configuration of

lib/oxidized/web.rb

@@ -1,49 +1,73 @@
+# frozen_string_literal: true
+
 require 'json'
+require 'puma'
 
 module Oxidized
   module API
     class Web
-      require 'rack/handler/puma'
+      include SemanticLogger::Loggable
+
       attr_reader :thread
 
+      DEFAULT_HOST = '127.0.0.1'
+      DEFAULT_PORT = 8888
+      DEFAULT_URI_PREFIX = ''
+
       def initialize(nodes, configuration)
         require 'oxidized/web/webapp'
-        if configuration.instance_of? Asetus::ConfigStruct
-          # New configuration syle: extensions.oxidized-web
-          addr = configuration.listen? || '127.0.0.1'
-          port = configuration.port? || 8888
-          uri = configuration.url_prefix? || ''
-          vhosts = configuration.vhosts? || []
-        else
-          # Old configuration stlyle: "rest: 127.0.0.1:8888/prefix"
-          listen, uri = configuration.split '/'
-          addr, _, port = listen.rpartition ':'
-          unless port
-            port = addr
-            addr = nil
-          end
-          vhosts = []
-        end
-        uri = "/#{uri}"
-        @opts = {
-          Host: addr,
-          Port: port
-        }
+        @addr, @port, uri_prefix, vhosts = self.class.parse_configuration(configuration)
+        uri_prefix = "/#{uri_prefix}"
         WebApp.set :nodes, nodes
         WebApp.set :host_authorization, { permitted_hosts: vhosts }
         @app = Rack::Builder.new do
-          map uri do
+          map uri_prefix do
             run WebApp
           end
         end
       end
 
       def run
         @thread = Thread.new do
-          Rack::Handler::Puma.run @app, **@opts
-          exit!
+          @server = Puma::Server.new @app
+          @server.add_tcp_listener @addr, @port
+          logger.info "Oxidized-web server listening on #{@addr}:#{@port}"
+          @server.run.join
         end
       end
+
+      def self.parse_configuration(configuration)
+        if configuration.instance_of? Asetus::ConfigStruct
+          parse_new_configuration(configuration)
+        else
+          parse_legacy_configuration(configuration)
+        end
+      end
+
+      # New configuration style: extensions.oxidized-web
+      def self.parse_new_configuration(configuration)
+        addr = configuration.listen? || DEFAULT_HOST
+        port = configuration.port? || DEFAULT_PORT
+        uri_prefix = configuration.url_prefix? || DEFAULT_URI_PREFIX
+        vhosts = configuration.vhosts? || []
+
+        [addr, port, uri_prefix, vhosts]
+      end
+
+      # Legacy configuration style: "rest: 127.0.0.1:8888/prefix"
+      def self.parse_legacy_configuration(configuration)
+        listen, uri_prefix = configuration.split('/', 2)
+        addr, _, port = listen.rpartition ':'
+        unless port
+          port = addr
+          addr = nil
+        end
+        port = port.to_i
+        uri_prefix ||= DEFAULT_URI_PREFIX
+        vhosts = []
+
+        [addr, port, uri_prefix, vhosts]
+      end
     end
   end
 end

oxidized-web.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'htmlentities',        '~> 4.3'
   s.add_dependency 'json',                '~> 2.3'
   s.add_dependency 'ostruct',             '~> 0.6'
-  s.add_dependency 'oxidized',            '~> 0.31'
+  s.add_dependency 'oxidized',            '~> 0.34.0'
   s.add_dependency 'puma',                '>= 3.11.4'
   s.add_dependency 'sinatra',             '>= 1.4.6'
   s.add_dependency 'sinatra-contrib',     '>= 1.4.6'

spec/spec_helper.rb

@@ -7,5 +7,6 @@
 require 'minitest/autorun'
 require 'rack/test'
 require 'oxidized'
+require 'oxidized/web'
 require 'oxidized/web/webapp'
 require 'mocha/minitest'

spec/node_spec.rb spec/web/node_spec.rbspec/node_spec.rb renamed to spec/web/node_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
 describe Oxidized::API::WebApp do
   include Rack::Test::Methods

spec/node_version_spec.rb spec/web/node_version_spec.rbspec/node_version_spec.rb renamed to spec/web/node_version_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
 describe Oxidized::API::WebApp do
   include Rack::Test::Methods

spec/nodes_spec.rb spec/web/nodes_spec.rbspec/nodes_spec.rb renamed to spec/web/nodes_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 require 'json'
 
 describe Oxidized::API::WebApp do

spec/root_spec.rb spec/web/root_spec.rbspec/root_spec.rb renamed to spec/web/root_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
 describe Oxidized::API::WebApp do
   include Rack::Test::Methods

spec/webapp_spec.rb spec/web/webapp_spec.rbspec/webapp_spec.rb renamed to spec/web/webapp_spec.rb

@@ -1,4 +1,4 @@
-require_relative 'spec_helper'
+require_relative '../spec_helper'
 
 # Test helper methods in Oxidized::API::WebApp