farmstead 0.0.49 → 0.0.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec037c550284eabc999c7005441c22fb30c76e76
-  data.tar.gz: b1150538511bafdaf0abd042dae20a2659bd5d23
+  metadata.gz: 5712d13aae031ac927525c97979c557f931262ce
+  data.tar.gz: 18b9fa530fb0b0489e422f97b10dbe669ef8a0ef
 SHA512:
-  metadata.gz: f10b4378ecdb678166eb64a73bd0c11cda1d9339130623b5bd79c39fdeeb508aa1ca4a9fa6e3a2b836d76a5437f3a40c193cf259a2266b897886c762bce4d26a
-  data.tar.gz: 9c0157d4d40f1dec9d98ace549b5b12d147b0d97402df89bdd903a7d4b4ec93d17b5ede53d8bce2e28b8491d08d3e7efd790c274c94f8c244278e82d5628cec0
+  metadata.gz: 2f81c5592410eb571c2ff326880ab4b65ba3f93c39977f12ce3b355c06fbb0e1aafe63c1da1f9a756a1b52e8a005a80492cbbb99e48074e0d0f963a0c71cf338
+  data.tar.gz: aa91a947497c79ccf7879ee30ff514900953c1fcaf1d7b8ad34382d40632b9f5f7fd92433f5081bb579c3177808a8b359dd4938bc9f8f2e9604be5f86f5039d7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    farmstead (0.0.49)
+    farmstead (0.0.50)
       httparty (~> 0.15.6)
       mechanize (~> 2.7)
       mysql2 (~> 0.4.10)

data/lib/farmstead/db.rb

@@ -22,6 +22,7 @@ module Farmstead
         primary_key(:id)
         String(:name)
         String(:type)
+        String(:config)
         String(:module)
       end
       @@DB.create_table :test do

data/lib/farmstead/pipeline/manage.rb

@@ -6,7 +6,7 @@
 #
 # Field --> Forest --> Road
 #
-# It then takes the config from the DB and passed it to the Wood topic
+# It then takes the config from the DB and passed it to the Field topic
 # 
 # The Extract class pulls the site config from the Field Topic and then pushes
 # site data to the Forest topic.
@@ -21,53 +21,23 @@
 # Every micro-service inherits the Service class
 module Farmstead
   module Manage
-    class Producer < Farmstead::Service
+    class Service < Farmstead::Service
       def run
-        loop do
-          puts 'Checking sites'
-          check_sites
-          puts 'Checking tasks'
-          # regular_tasks
-          sleep 3
+        # Cycle thru sources, pull config and pass to Kafka
+        @@DB[:sources].each do |source|
+          result = source["config"]
+          puts result
+          @producer.produce(result, topic: "Field")
+          @producer.deliver_messages
         end
       end
 
-      # Checks for any new sites to be processed
+      # Checks for any new sources to be processed
       # Adds them to the message queue
-      def check_sites
-        sites = @mysql.query("SELECT * FROM sites WHERE pickedup = 'false'")
-        return false if sites.count.zero?
-        sites.each do |site|
-          json = site.to_json
-          siteid = get_from_json(json, 'id')
-          # import_site(json, siteid)
-          write_message(json, topic: 'Wood')
-          mark_pickedup(siteid)
-        end
-      end
-    end
-
-    # Subscribed to the Road topic
-    # Imports Hash into MySQL Database for each message
-    class Consumer < Farmstead::Service
-      def run
-        @consumer.subscribe('Road')
-        trap('TERM') { @consumer.stop }
-        @consumer.each_message do |message|
-          puts "Received: #{message.value}"
-          hash = JSON.parse(message.value)
-          import_site(hash, hash[:id])
-          mark_processed(hash[:id])
-          @consumer.mark_message_as_processed(message)
-        end
-      end
-
-      # Checks for any new sites to be processed
-      # Adds them to the message queue
-      def check_sites
-        sites = @mysql.query("SELECT * FROM sites WHERE pickedup = 'false'")
-        return false if sites.count.zero?
-        sites.each do |site|
+      def check_sources
+        sources = @mysql.query("SELECT * FROM sources WHERE pickedup = 'false'")
+        return false if sources.count.zero?
+        sources.each do |site|
           json = site.to_json
           siteid = get_from_json(json, 'id')
           # import_site(json, siteid)

data/lib/farmstead/scaffold/supervisord.conf.erb

@@ -1,12 +1,8 @@
 [supervisord]
 nodaemon=true
 
-[program:producer]
-command=/usr/local/bin/ruby /service/project.rb %(ENV_SERVICE)s Producer
-redirect_stderr=true
-
-[program:consumer]
-command=/usr/local/bin/ruby /service/project.rb %(ENV_SERVICE)s Consumer
+[program:service]
+command=/usr/local/bin/ruby /service/project.rb %(ENV_SERVICE)s Service
 redirect_stderr=true
 
 [program:api]

data/lib/farmstead/version.rb

@@ -1,3 +1,3 @@
 module Farmstead
-  VERSION = "0.0.49"
+  VERSION = "0.0.50"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: farmstead
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.50
 platform: ruby
 authors:
 - Ken Jenney