refactor: move to correct place

alexfalkowski · May 14, 2021 · 175833c · 175833c
1 parent a1ce724
commit 175833c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/lib/nonnative/configuration.rb b/lib/nonnative/configuration.rb
@@ -95,9 +95,7 @@ def add_services(file)
       services.each do |fd|
         service do |s|
           s.name = fd['name']
-          s.timeout = fd['timeout']
           s.port = fd['port']
-          s.log = fd['log']
 
           proxy s, fd['proxy']
         end

diff --git a/lib/nonnative/configuration_process.rb b/lib/nonnative/configuration_process.rb
@@ -2,6 +2,6 @@
 
 module Nonnative
   class ConfigurationProcess < ConfigurationRunner
-    attr_accessor :command, :signal
+    attr_accessor :command, :signal, :timeout, :log
   end
 end
diff --git a/lib/nonnative/configuration_runner.rb b/lib/nonnative/configuration_runner.rb
@@ -2,7 +2,7 @@
 
 module Nonnative
   class ConfigurationRunner
-    attr_accessor :name, :timeout, :port, :log
+    attr_accessor :name, :port
     attr_reader :proxy
 
     def initialize

diff --git a/lib/nonnative/configuration_server.rb b/lib/nonnative/configuration_server.rb
@@ -2,6 +2,6 @@
 
 module Nonnative
   class ConfigurationServer < ConfigurationRunner
-    attr_accessor :klass
+    attr_accessor :klass, :timeout, :log
   end
 end
diff --git a/lib/nonnative/process.rb b/lib/nonnative/process.rb
@@ -2,6 +2,12 @@
 
 module Nonnative
   class Process < Runner
+    def initialize(service)
+      super service
+
+      @timeout = Nonnative::Timeout.new(service.timeout)
+    end
+
     def start
       unless process_exists?
         proxy.start
@@ -32,7 +38,7 @@ def wait_stop
 
     private
 
-    attr_reader :pid
+    attr_reader :pid, :timeout
 
     def process_kill
       signal = Signal.list[service.signal || 'INT'] || Signal.list['INT']

diff --git a/lib/nonnative/runner.rb b/lib/nonnative/runner.rb
@@ -6,7 +6,6 @@ class Runner
 
     def initialize(service)
       @service = service
-      @timeout = Nonnative::Timeout.new(service.timeout)
       @proxy = Nonnative::ProxyFactory.create(service)
     end
 
@@ -16,7 +15,7 @@ def name
 
     protected
 
-    attr_reader :service, :timeout
+    attr_reader :service
 
     def wait_start
       sleep 0.1

diff --git a/lib/nonnative/server.rb b/lib/nonnative/server.rb
@@ -2,6 +2,12 @@
 
 module Nonnative
   class Server < Runner
+    def initialize(service)
+      super service
+
+      @timeout = Nonnative::Timeout.new(service.timeout)
+    end
+
     def start
       unless thread
         proxy.start
@@ -28,6 +34,6 @@ def stop
 
     private
 
-    attr_reader :thread
+    attr_reader :thread, :timeout
   end
 end