work in progress

Author: terrywbrady

run_bundle.sh

@@ -10,7 +10,7 @@ bundle install
 bundle update
 cd ../src-colladmin
 rm -rf vendor/bundle/ruby/3*/bundler/gems/mrt-zk*
-bundle install --redownload
+bundle install
 bundle update
 cd ../src-testdriver
 bundle install

src-colladmin/Gemfile

@@ -12,8 +12,7 @@ gem 'aws-sdk-lambda'
 gem 'aws-sdk-s3'
 gem 'aws-sdk-ssm'
 gem 'csv'
-gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', branch: 'main'
-#gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', branch: 'main', ref: '4f5a5be'
+gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', tag: '1.0.1.j'
 gem 'rest-client'
 gem 'rubocop'
 gem 'uc3-ssm', '0.3.10', git: 'https://github.com/CDLUC3/uc3-ssm.git', branch: 'main'

src-colladmin/Gemfile.lock

@@ -1,6 +1,7 @@
 GIT
   remote: https://github.com/CDLUC3/mrt-zk.git
-  revision: 4f5a5be169dfc9cf9eca403afaa115cfa9fb5d01
+  revision: 8221456e59169583047c0bb70510bf997b09762e
+  ref: 8221456
   branch: main
   specs:
     mrt-zk (1.0.1)

src-colladmin/actions/zookeeper_action.rb

@@ -109,12 +109,13 @@ def register_item(item)
   end
 
   def perform_action
+    jobs = MerrittZK::LegacyIngestJob.list_jobs(@zk)
+    jobs.each do |po|
+      register_item(QueueEntry.new(po))
+    end
     @zk.children(zk_path).each do |cp|
-      puts cp
       arr = @zk.get("#{zk_path}/#{cp}")
       po = QueueItemReader.new(self, cp, arr[0]).payload_object
-      puts po.to_json
-      puts MerrittZK::LegacyIngestJob.list_jobs(@zk)
       register_item(QueueEntry.new(po))
     end
     convert_json_to_table('')
@@ -125,7 +126,8 @@ def table_rows(_body)
   end
 
   def get_zookeeper_conn
-    @config.fetch('zookeeper', '').split(',').first
+    #@config.fetch('zookeeper', '').split(',').first
+    @config.fetch('zookeeper', '')
   end
 end