lex-scheduler 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22cca866470f3df8eb371b2a467fbdbe6d9b9a37ff81eba37705640a5c813e4
-  data.tar.gz: f502c95d2cbb51c45fe052493603db98dbc01cc21970a8650353736cfbcb91f3
+  metadata.gz: 1594d2e1b206c9074f9f0be71337c5322a2e5d18088e42faddbd1381ecb4d8e3
+  data.tar.gz: 36b2c9752e52df2f6ce332fc28d0bf807ad8251afa001af7f2fe691d48793753
 SHA512:
-  metadata.gz: a3ca95510c2fb415ab488727cbe87a11d32d1387abcf156329f473f1f93b3ebf3b4133251900a4756360cbb13544f42ff2b90058aa22735098f5400d4e0447a3
-  data.tar.gz: 4112f741dc77173ed6e52cc77dd718b0d5db4fd0b389509e0e6080b1bf785bc800e00cc1ec1b92bcc1805c52d3bd7471e587b07df515d16f4e76a62154257af7
+  metadata.gz: f58ff3e752717c49aa71369d8ca33bdcff54cd574063a447585e38564543b6c77a0b069ee5cdfe360daaf4ee56c4e14cfbab869b0fd6594499940f9c043a8bde
+  data.tar.gz: 5230c4c2c6e3f71ff532d9f7d083006d25d5c4364ac5d54afc3e661bdf6cb4305a0ffd66004291fa2af5e2e557ff4a1bee6514e25c786c1a1caa63eff1eb1b56

data/.rubocop.yml

@@ -7,7 +7,11 @@ Metrics/ClassLength:
 Metrics/BlockLength:
   Max: 50
 Metrics/AbcSize:
-  Max: 50
+  Max: 100
+Metrics/CyclomaticComplexity:
+  Max: 15
+Metrics/PerceivedComplexity:
+  Max: 20
 Style/Documentation:
   Enabled: false
 AllCops:

data/lib/legion/extensions/scheduler/data/migrations/006_add_transform_to_schedule.rb

@@ -0,0 +1,7 @@
+Sequel.migration do
+  change do
+    alter_table(:schedules) do
+      add_column :transformation, String, text: true
+    end
+  end
+end

data/lib/legion/extensions/scheduler/runners/schedule.rb

@@ -1,3 +1,5 @@
+require 'fugit'
+
 module Legion
   module Extensions
     module Scheduler
@@ -13,17 +15,29 @@ module Legion
           end
 
           def refresh(**)
-            Legion::Cache.set('scheduler_schedule_lock', Legion::Settings[:client][:name], 5)
+            Legion::Cache.set('scheduler_schedule_lock', Legion::Settings[:client][:name], 2)
           end
 
           def schedule_tasks(**)
             return unless Legion::Cache.get('scheduler_schedule_lock') == Legion::Settings[:client][:name]
 
             models_class::Schedule.where(active: 1).each do |row|
-              next unless row.values[:interval].positive?
-              next if (Time.now - row.values[:last_run]) < row.values[:interval]
+              if row.values[:interval].is_a?(Integer) && row.values[:interval].positive?
+                next if (Time.now - row.values[:last_run]) < row.values[:interval]
+              elsif row.values[:cron].is_a? String
+                cron_class = Fugit.parse(row.values[:cron])
+                if cron_class.respond_to? :to_sec
+                  next if (Time.now - row.values[:last_run]) < cron_class.to_sec
+                elsif cron_class.respond_to? :previous_time
+                  next if Time.now < Time.parse(cron_class.previous_time.to_s)
+                  next if row.values[:last_run] > Time.parse(cron_class.previous_time.to_s)
+                end
+              end
 
-              send_task(function_id: row.values[:function_id], **Legion::JSON.load(row.values[:payload]))
+              send_task(transformation: row.values[:transformation],
+                        function_id: row.values[:function_id],
+                        function: row.values[:name],
+                        **Legion::JSON.load(row.values[:payload]))
               row.update(last_run: Sequel::CURRENT_TIMESTAMP)
             end
           end
@@ -34,6 +48,12 @@ module Legion
               payload[thing] = opts[thing] if opts.key? thing
             end
 
+            return Legion::Transport::Messages::Dynamic.new(**payload).publish if opts[:transformation].nil?
+
+            payload[:exchange] = 'task'
+            payload[:routing_key] = 'task.subtask.transform'
+            payload[:transformation] = opts[:transformation]
+
             Legion::Extensions::Scheduler::Transport::Messages::SendTask.new(**payload).publish
           end
         end

data/lib/legion/extensions/scheduler/transport/messages/send_task.rb

@@ -5,6 +5,8 @@ module Legion::Extensions::Scheduler::Transport::Messages
     end
 
     def message
+      return @options if routing_key == 'task.subtask.transform'
+
       {
         args: @options[:args] || @options,
         function: function.values[:name]
@@ -12,11 +14,19 @@ module Legion::Extensions::Scheduler::Transport::Messages
     end
 
     def routing_key
-      "#{function.runner.extension.values[:name]}.#{function.runner.values[:name]}.#{function.values[:name]}"
+      @routing_key ||= if @options.key?(:routing_key)
+                         @options[:routing_key]
+                       else
+                         "#{function.runner.extension.values[:name]}.#{function.runner.values[:name]}.#{function.values[:name]}" # rubocop:disable Layout/LineLength
+                       end
     end
 
     def exchange
-      Legion::Transport::Exchange.new(function.runner.extension.values[:exchange])
+      @exchange ||= if @options.key?(:exchange) && @options[:exchange].is_a?(String)
+                      Legion::Transport::Exchange.new(@options[:exchange])
+                    else
+                      Legion::Transport::Exchange.new(function.runner.extension.values[:exchange])
+                    end
     end
 
     def function

data/lib/legion/extensions/scheduler/version.rb

@@ -3,7 +3,7 @@
 module Legion
   module Extensions
     module Scheduler
-      VERSION = '0.1.0'
+      VERSION = '0.1.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lex-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Esity
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-14 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fugit
@@ -120,6 +120,7 @@ files:
 - lib/legion/extensions/scheduler/data/migrations/003_schedule_indexes.rb
 - lib/legion/extensions/scheduler/data/migrations/004_schedule_logs_indexes.rb
 - lib/legion/extensions/scheduler/data/migrations/005_add_payload_column.rb
+- lib/legion/extensions/scheduler/data/migrations/006_add_transform_to_schedule.rb
 - lib/legion/extensions/scheduler/data/models/schedule.rb
 - lib/legion/extensions/scheduler/data/models/schedule_log.rb
 - lib/legion/extensions/scheduler/runners/schedule.rb