Skip to content

Commit 68febc9

Browse files
committed
categorize next steps
1 parent 954607a commit 68febc9

File tree

11 files changed

+126
-107
lines changed

11 files changed

+126
-107
lines changed

src-colladmin/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ gem 'aws-sdk-lambda'
1212
gem 'aws-sdk-s3'
1313
gem 'aws-sdk-ssm'
1414
gem 'csv'
15-
gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', tag: '1.0.1.j'
15+
gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', tag: '1.0.1.l'
1616
gem 'rest-client'
1717
gem 'rubocop'
1818
gem 'uc3-ssm', '0.3.10', git: 'https://github.com/CDLUC3/uc3-ssm.git', branch: 'main'

src-colladmin/actions/admin_profile_action.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,6 @@ def perform_action
102102
return { message: "Ark #{ark} not found" }.to_json if p.nil?
103103

104104
case @path
105-
when 'toggle_harvest'
106-
MerrittQuery.new(@config).run_update(
107-
'update inv_collections set harvest_privilege = ? where ark = ?',
108-
[p.toggle_harvest, ark],
109-
'Update successful, reload page to see result'
110-
).to_json
111105
when 'set_mnemonic'
112106
return { message: 'Context not found' }.to_json if p.key.empty?
113107

src-colladmin/actions/zookeeper_action.rb

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,12 @@ def perform_action
113113
jobs.each do |po|
114114
register_item(QueueEntry.new(po))
115115
end
116-
@zk.children(zk_path).each do |cp|
117-
arr = @zk.get("#{zk_path}/#{cp}")
118-
po = QueueItemReader.new(self, cp, arr[0]).payload_object
119-
register_item(QueueEntry.new(po))
116+
if false
117+
@zk.children(zk_path).each do |cp|
118+
arr = @zk.get("#{zk_path}/#{cp}")
119+
po = QueueItemReader.new(self, cp, arr[0]).payload_object
120+
register_item(QueueEntry.new(po))
121+
end
120122
end
121123
convert_json_to_table('')
122124
end
@@ -137,7 +139,7 @@ def zk_path
137139
end
138140

139141
def status_vals
140-
['Pending', 'Consumed', 'Deleted', 'Completed', 'Failed', 'Resolved']
142+
['Pending', 'Consumed', 'Deleted', 'Failed', 'Completed', 'Held']
141143
end
142144

143145
def is_json

0 commit comments

Comments
 (0)