web47core 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dcbae4501d31c989d6dbaebd98d27746bc8ade332a79a2d9f19453130fed2eb
-  data.tar.gz: f5f9e2daa88c92fe74467ed4f3121e7841a53c4f80f35e0c6bcc645c49456585
+  metadata.gz: 00d13c9db9f30f83dae32f68e402d1916193c73628c430694834b47c4893475e
+  data.tar.gz: 2d91396fa1a980ed68347d801fbf9c3149669823d44b23ffd730e7344cb4ff0d
 SHA512:
-  metadata.gz: a66ebb112c02a247f81b6aaadb363f5b9444995ea2ac7af47792f49f5a6f0afeed8ebceb88b19f44d47471d8705c1978dd0da06e5ef818315be7c9a342734a1e
-  data.tar.gz: 3cc23f38c26a06cba34e9eb719e750d010e90feb8add4c03e2cb8df33008813ea6a05ae2d46e6e2534089bae12da4d4b3fd5eb2c0288aa5eae148d9cbd77bd27
+  metadata.gz: 1f1049f2332a61a551a403b8a20d2f6fb8e697305cb7b13dedff4ee28cfb0f3cb2bcadd000c0b9a3ee9bd5a397052930f659d67bd5567263773c01992e8b2302
+  data.tar.gz: cafe990fbe4618b188f62ea4da75309342abd2155b47ef1983ce1a63eb6600735ea624682d7c0757857f087d589ee23df12e49177620d080561be24fc047c320

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    web47core (0.1.2)
+    web47core (0.1.4)
       activesupport (~> 5.0)
       aws-sdk-autoscaling
       daemons
@@ -113,7 +113,7 @@ GEM
     email_regex (0.0.1)
     erubi (1.9.0)
     execjs (2.7.0)
-    factory_bot (5.1.1)
+    factory_bot (5.1.2)
       activesupport (>= 4.2.0)
     factory_bot_rails (5.1.1)
       factory_bot (~> 5.1.0)
@@ -248,7 +248,7 @@ GEM
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (~> 3.0)
     shoulda-context (1.2.2)
-    shoulda-matchers (3.1.2)
+    shoulda-matchers (3.1.3)
       activesupport (>= 4.0.0)
     simplecov (0.16.1)
       docile (~> 1.1)

data/README.md

@@ -139,4 +139,7 @@ Allowed values of cron_tab_entry are
 * :monthly - run every month on the first day of the month
 * '*/5 1,3 * 2 *' - Run according to unix crontab entry format. This would run every tuesday on the 1st and 3rd hour, for any minute divisable by 5, so 0, 5, 10, 15, etc..
 
-4. 
+4. Before starting the server, you need to run the database command 
+```mongo
+db.cron_tabs.updateMany({_type: 'JobCronTab'}, {$set: {_type: 'Cron::JobTab'}});
+``` 

data/bin/cron_server

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 
-require Rails.root.join('config', 'environment')
-Cron::Worker.logger ||= Logger.new(File.join(Rails.root, 'log', 'cron_server.log'))
+require File.join(Dir.getwd, 'config', 'environment')
 Cron::Command.new(ARGV).daemonize

data/lib/app/jobs/cron/command.rb

@@ -10,11 +10,11 @@ require 'optparse'
 require 'pathname'
 
 module Cron
-  class Command # rubocop:disable ClassLength
+  class Command
 
     DIR_PWD = Pathname.new Dir.pwd
 
-    def initialize(args) # rubocop:disable MethodLength
+    def initialize(args)
       @options = { pid_dir: "#{root}/tmp/pids", log_dir: "#{root}/log", monitor: false }
 
       opts = OptionParser.new do |opt|
@@ -46,30 +46,16 @@ module Cron
       @args = opts.parse!(args) + (@daemon_options || [])
     end
 
-    def daemonize # rubocop:disable PerceivedComplexity
+    def daemonize
       dir = @options[:pid_dir]
       FileUtils.mkdir_p(dir) unless File.exist?(dir)
 
       Cron::JobTab.ensure_cron_tabs
-      Cron::Worker.logger ||= Logger.new(File.join(@options[:log_dir], 'cron.log'))
-      Daemons.run_proc('cron_server',
-                       dir: options[:pid_dir],
-                       dir_mode: :normal,
-                       monitor: @options[:monitor],
-                       ARGV: @args) do
-        run @options
+      Daemons.run_proc('cron_server', dir: @options[:pid_dir], monitor: @options[:monitor], ARGV: @args) do
+        loop { sleep Cron::Server.find_or_create_server.execute }
       end
     end
 
-    def run(options = {})
-      Dir.chdir(root)
-
-      Cron::Worker.new(options).start
-    rescue StandardError => error
-      App47Logger.log_error 'Unable to start Cron Server', error
-      exit 1
-    end
-
     private
 
     def root

data/lib/app/jobs/cron/job_tab.rb

@@ -5,10 +5,7 @@
 #
 module Cron
   class JobTab < Tab
-    unless defined? FRAMEWORK_CLASSES
-      FRAMEWORK_CLASSES = %w[job trim_collection command server tab job_tab worker].freeze
-    end
-    cattr_accessor :jobs
+    FRAMEWORK_CLASSES = %w[Job TrimCollection Command Server Tab JobTab].freeze unless defined? FRAMEWORK_CLASSES
     #
     # Validations
     #
@@ -28,14 +25,7 @@ module Cron
       end
 
       def ensure_cron_tabs
-        self.jobs = []
-        Cron.constants.each do |job|
-          job_name = job.to_s.underscore
-          next if FRAMEWORK_CLASSES.include?(job_name) ||
-            job_name.end_with?('_test') ||
-            job_name.start_with?('base_')
-
-          jobs << job_name
+        job_names.each do |job_name|
           klass = "cron/#{job_name}".camelize.constantize
           tab = JobTab.find_or_initialize_by name: job_name
           next if tab.persisted?
@@ -45,6 +35,16 @@ module Cron
         purge_cron_tabs
       end
 
+      def job_names
+        @job_names ||= Cron.constants.collect do |job|
+          job_name = job.to_s
+          next if FRAMEWORK_CLASSES.include?(job_name) ||
+            job_name.end_with?('Test') ||
+            job_name.start_with?('Base')
+
+          job_name.underscore
+        end.compact
+      end
 
       private
 
@@ -68,7 +68,7 @@ module Cron
 
       def purge_cron_tabs
         JobTab.all.each do |tab|
-          tab.destroy unless jobs.include?(tab.name)
+          tab.destroy unless job_names.include?(tab.name)
         end
       end
     end
@@ -120,7 +120,7 @@ module Cron
     # Test the name is the list of jobs discovered
     #
     def valid_name
-      errors.add(:name, 'Invalid Tab') unless jobs.include?(name)
+      errors.add(:name, 'Invalid Tab') unless JobTab.job_names.include?(name)
     end
   end
 end

data/lib/web47core.rb

@@ -25,7 +25,6 @@ require 'app/jobs/cron/job'
 require 'app/jobs/cron/tab'
 require 'app/jobs/cron/job_tab'
 require 'app/jobs/cron/command'
-require 'app/jobs/cron/worker'
 require 'app/jobs/cron/server'
 require 'app/jobs/cron/trim_collection'
 require 'app/jobs/cron/switchboard_sync_configuration'

data/web47core.gemspec

@@ -8,7 +8,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.required_ruby_version = '~> 2.4.1'
   spec.name          = 'web47core'
-  spec.version       = '0.1.3'
+  spec.version       = '0.1.4'
   spec.authors       = ['Chris Schroeder']
   spec.email         = ['chris@app47.com']
   spec.summary       = 'App47 Web Core Library.'
@@ -16,8 +16,6 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://app47.com'
   spec.license       = 'MIT'
 
-  spec.executables   << 'cron_server'
-
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test)/})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris Schroeder
@@ -534,7 +534,6 @@ files:
 - lib/app/jobs/cron/trim_cron_servers.rb
 - lib/app/jobs/cron/trim_failed_delayed_jobs.rb
 - lib/app/jobs/cron/trim_notifications.rb
-- lib/app/jobs/cron/worker.rb
 - lib/app/models/concerns/app47_logger.rb
 - lib/app/models/concerns/cdn_url.rb
 - lib/app/models/concerns/core_account.rb

data/lib/app/jobs/cron/worker.rb

@@ -1,70 +0,0 @@
-require 'timeout'
-require 'active_support/dependencies'
-require 'active_support/core_ext/numeric/time'
-require 'active_support/core_ext/class/attribute_accessors'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/hash/indifferent_access'
-require 'logger'
-require 'benchmark'
-
-module Cron
-  class Worker # rubocop:disable ClassLength
-    DEFAULT_LOG_LEVEL = 'info'.freeze
-
-    cattr_accessor :logger, :default_log_level
-
-    def self.reset
-      self.default_log_level ||= DEFAULT_LOG_LEVEL
-    end
-
-    def self.reload_app?
-      defined?(ActionDispatch::Reloader) && Rails.application.config.cache_classes == false
-    end
-
-    def initialize(options = {})
-      super()
-      @exit = options[:exit_on_complete].presence
-    end
-
-    # Every worker has a unique name which by default is the pid of the process. There are some
-    # advantages to overriding this with something which survives worker restarts:  Workers can
-    # safely resume working on tasks which are locked by themselves. The worker will assume that
-    # it crashed before.
-    def name
-      @name ||= "CronServer:#{Socket.gethostname} pid:#{Process.pid}"
-    end
-
-    def start # rubocop:disable CyclomaticComplexity, PerceivedComplexity
-      trap('TERM') { stop }
-      trap('INT') { stop }
-
-      say 'Starting cron jobs server'
-
-      self.class.lifecycle.run_callbacks(:execute, self) do
-        loop do
-          sleep Cron::Server.find_or_create_server.execute
-          break if stop?
-        end
-      end
-
-      say 'Exiting cron jobs server...'
-    end
-
-    def stop
-      @exit = true
-    end
-
-    def stop?
-      !!@exit
-    end
-
-    def say(text, level = default_log_level)
-      text = "[CronServer(#{name})] #{text}"
-      return if logger.blank?
-
-      logger.send(level, "#{Time.now.strftime('%FT%T%z')}: #{text}")
-    end
-  end
-end
-
-Cron::Worker.reset