mirror of
https://github.com/plashchynski/crono.git
synced 2026-04-10 19:27:01 +02:00
remove deprecated
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,3 +8,4 @@
|
|||||||
/tmp/
|
/tmp/
|
||||||
log/*.log
|
log/*.log
|
||||||
.byebug_history
|
.byebug_history
|
||||||
|
spec/internal
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ PATH
|
|||||||
specs:
|
specs:
|
||||||
crono (1.1.2)
|
crono (1.1.2)
|
||||||
rails (>= 5.2.8)
|
rails (>= 5.2.8)
|
||||||
|
sprockets-rails
|
||||||
|
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
@@ -179,6 +180,13 @@ GEM
|
|||||||
rack (~> 2.2)
|
rack (~> 2.2)
|
||||||
rack-protection (= 2.2.0)
|
rack-protection (= 2.2.0)
|
||||||
tilt (~> 2.0)
|
tilt (~> 2.0)
|
||||||
|
sprockets (4.0.3)
|
||||||
|
concurrent-ruby (~> 1.0)
|
||||||
|
rack (> 1, < 3)
|
||||||
|
sprockets-rails (3.4.2)
|
||||||
|
actionpack (>= 5.2)
|
||||||
|
activesupport (>= 5.2)
|
||||||
|
sprockets (>= 3.0.0)
|
||||||
sqlite3 (1.4.2)
|
sqlite3 (1.4.2)
|
||||||
strscan (3.0.3)
|
strscan (3.0.3)
|
||||||
temple (0.8.2)
|
temple (0.8.2)
|
||||||
|
|||||||
@@ -153,7 +153,6 @@ Usage: crono [options] [start|stop|restart|run]
|
|||||||
-P, --pidfile PATH Deprecated! use --piddir with --process_name; Path to pidfile (Default: )
|
-P, --pidfile PATH Deprecated! use --piddir with --process_name; Path to pidfile (Default: )
|
||||||
-D, --piddir PATH Path to piddir (Default: tmp/pids)
|
-D, --piddir PATH Path to piddir (Default: tmp/pids)
|
||||||
-N, --process_name NAME Name of the process (Default: crono)
|
-N, --process_name NAME Name of the process (Default: crono)
|
||||||
-d, --[no-]daemonize Deprecated! Instead use crono [start|stop|restart] without this option; Daemonize process (Default: false)
|
|
||||||
-m, --monitor Start monitor process for a deamon (Default false)
|
-m, --monitor Start monitor process for a deamon (Default false)
|
||||||
-e, --environment ENV Application environment (Default: development)
|
-e, --environment ENV Application environment (Default: development)
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
|
|||||||
s.require_paths = ["lib"]
|
s.require_paths = ["lib"]
|
||||||
|
|
||||||
s.add_dependency 'rails', '>= 5.2.8'
|
s.add_dependency 'rails', '>= 5.2.8'
|
||||||
|
s.add_dependency 'sprockets-rails'
|
||||||
s.add_development_dependency 'rake', '>= 13.0.1'
|
s.add_development_dependency 'rake', '>= 13.0.1'
|
||||||
s.add_development_dependency 'bundler', '>= 2'
|
s.add_development_dependency 'bundler', '>= 2'
|
||||||
s.add_development_dependency 'rspec', '>= 3.10'
|
s.add_development_dependency 'rspec', '>= 3.10'
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ module Crono
|
|||||||
end
|
end
|
||||||
|
|
||||||
require 'rails'
|
require 'rails'
|
||||||
|
require 'sprockets/railtie'
|
||||||
require 'active_support/all'
|
require 'active_support/all'
|
||||||
require 'crono/version'
|
require 'crono/version'
|
||||||
require 'crono/engine'
|
require 'crono/engine'
|
||||||
|
|||||||
@@ -50,25 +50,11 @@ module Crono
|
|||||||
def setup_log
|
def setup_log
|
||||||
if config.daemonize
|
if config.daemonize
|
||||||
self.logfile = config.logfile
|
self.logfile = config.logfile
|
||||||
elsif config.deprecated_daemonize
|
|
||||||
self.logfile = config.logfile
|
|
||||||
deprecated_daemonize
|
|
||||||
else
|
else
|
||||||
self.logfile = STDOUT
|
self.logfile = STDOUT
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def deprecated_daemonize
|
|
||||||
::Process.daemon(true, true)
|
|
||||||
|
|
||||||
[$stdout, $stderr].each do |io|
|
|
||||||
File.open(config.logfile, 'ab') { |f| io.reopen(f) }
|
|
||||||
io.sync = true
|
|
||||||
end
|
|
||||||
|
|
||||||
$stdin.reopen('/dev/null')
|
|
||||||
end
|
|
||||||
|
|
||||||
def write_pid
|
def write_pid
|
||||||
return unless config.pidfile
|
return unless config.pidfile
|
||||||
pidfile = File.expand_path(config.pidfile)
|
pidfile = File.expand_path(config.pidfile)
|
||||||
@@ -150,10 +136,6 @@ module Crono
|
|||||||
config.process_name = process_name
|
config.process_name = process_name
|
||||||
end
|
end
|
||||||
|
|
||||||
opts.on("-d", "--[no-]daemonize", "Deprecated! Instead use crono [start|stop|restart] without this option; Daemonize process (Default: #{config.daemonize})") do |daemonize|
|
|
||||||
config.deprecated_daemonize = daemonize
|
|
||||||
end
|
|
||||||
|
|
||||||
opts.on("-m", "--monitor", "Start monitor process for a deamon (Default #{config.monitor})") do
|
opts.on("-m", "--monitor", "Start monitor process for a deamon (Default #{config.monitor})") do
|
||||||
config.monitor = true
|
config.monitor = true
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ module Crono
|
|||||||
PROCESS_NAME = 'crono'
|
PROCESS_NAME = 'crono'
|
||||||
|
|
||||||
attr_accessor :cronotab, :logfile, :pidfile, :piddir, :process_name,
|
attr_accessor :cronotab, :logfile, :pidfile, :piddir, :process_name,
|
||||||
:monitor, :daemonize, :deprecated_daemonize, :environment
|
:monitor, :daemonize, :environment
|
||||||
|
|
||||||
def initialize
|
def initialize
|
||||||
self.cronotab = CRONOTAB
|
self.cronotab = CRONOTAB
|
||||||
@@ -16,7 +16,6 @@ module Crono
|
|||||||
self.piddir = PIDDIR
|
self.piddir = PIDDIR
|
||||||
self.process_name = PROCESS_NAME
|
self.process_name = PROCESS_NAME
|
||||||
self.daemonize = false
|
self.daemonize = false
|
||||||
self.deprecated_daemonize = false
|
|
||||||
self.monitor = false
|
self.monitor = false
|
||||||
self.environment = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
|
self.environment = ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
|
||||||
end
|
end
|
||||||
@@ -28,7 +27,7 @@ module Crono
|
|||||||
end
|
end
|
||||||
|
|
||||||
def pidfile
|
def pidfile
|
||||||
@pidfile || (deprecated_daemonize ? PIDFILE : nil)
|
@pidfile
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -63,11 +63,6 @@ describe Crono::CLI do
|
|||||||
expect(cli.config.monitor).to be true
|
expect(cli.config.monitor).to be true
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should set deprecated_daemonize' do
|
|
||||||
cli.send(:parse_options, ['--daemonize'])
|
|
||||||
expect(cli.config.deprecated_daemonize).to be true
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should set environment' do
|
it 'should set environment' do
|
||||||
cli.send(:parse_options, ['--environment', 'production'])
|
cli.send(:parse_options, ['--environment', 'production'])
|
||||||
expect(cli.config.environment).to be_eql('production')
|
expect(cli.config.environment).to be_eql('production')
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ describe Crono::Config do
|
|||||||
expect(@config.piddir).to be Crono::Config::PIDDIR
|
expect(@config.piddir).to be Crono::Config::PIDDIR
|
||||||
expect(@config.process_name).to be Crono::Config::PROCESS_NAME
|
expect(@config.process_name).to be Crono::Config::PROCESS_NAME
|
||||||
expect(@config.daemonize).to be false
|
expect(@config.daemonize).to be false
|
||||||
expect(@config.deprecated_daemonize).to be false
|
|
||||||
expect(@config.monitor).to be false
|
expect(@config.monitor).to be false
|
||||||
expect(@config.environment).to be_eql ENV['RAILS_ENV']
|
expect(@config.environment).to be_eql ENV['RAILS_ENV']
|
||||||
end
|
end
|
||||||
@@ -25,12 +24,6 @@ describe Crono::Config do
|
|||||||
|
|
||||||
specify { expect(pidfile).to be_nil }
|
specify { expect(pidfile).to be_nil }
|
||||||
end
|
end
|
||||||
|
|
||||||
context "deprecated_daemonize is true" do
|
|
||||||
before { config.deprecated_daemonize = true }
|
|
||||||
|
|
||||||
specify { expect(pidfile).to eq Crono::Config::PIDFILE }
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context "explicity configured" do
|
context "explicity configured" do
|
||||||
|
|||||||
Binary file not shown.
@@ -63,11 +63,6 @@ describe Crono::CLI do
|
|||||||
expect(cli.config.monitor).to be true
|
expect(cli.config.monitor).to be true
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should set deprecated_daemonize' do
|
|
||||||
cli.send(:parse_options, ['--daemonize'])
|
|
||||||
expect(cli.config.deprecated_daemonize).to be true
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'should set environment' do
|
it 'should set environment' do
|
||||||
cli.send(:parse_options, ['--environment', 'production'])
|
cli.send(:parse_options, ['--environment', 'production'])
|
||||||
expect(cli.config.environment).to be_eql('production')
|
expect(cli.config.environment).to be_eql('production')
|
||||||
|
|||||||
Reference in New Issue
Block a user