Skip to content

Commit 2790447

Browse files
committed
fix legacy obj
1 parent e90b7e1 commit 2790447

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/main/ruby/lib/merritt_zk_job.rb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -207,47 +207,47 @@ def status_vals
207207
end
208208

209209
def submitter
210-
json.fetch('submitter', '')
210+
@payload.fetch('submitter', '')
211211
end
212212

213213
def creator
214-
json.fetch('creator', '')
214+
@payload.fetch('creator', '')
215215
end
216216

217217
def profile
218-
json.fetch('profile', '')
218+
@payload.fetch('profile', '')
219219
end
220220

221221
def response_form
222-
json.fetch('responseForm', '')
222+
@payload.fetch('responseForm', '')
223223
end
224224

225225
def filename
226-
json.fetch('filename', '')
226+
@payload.fetch('filename', '')
227227
end
228228

229229
def udpate
230-
json.fetch('update', false)
230+
@payload.fetch('update', false)
231231
end
232232

233233
def type
234-
json.fetch('type', '')
234+
@payload.fetch('type', '')
235235
end
236236

237237
def title
238-
json.fetch('title', '')
238+
@payload.fetch('title', '')
239239
end
240240

241241
def bid
242-
json.fetch('bid', '')
242+
@payload.fetch('bid', '')
243243
end
244244

245245
def priority
246-
json.fetch('priority', 0)
246+
@payload.fetch('priority', 0)
247247
end
248248

249249
def title
250-
json.fetch('space_needed', 0)
250+
@payload.fetch('space_needed', 0)
251251
end
252252

253253
def self.list_jobs(zk)

src/main/ruby/lib/merritt_zk_queue_item.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,15 @@ def initialize(id)
135135
@id = id
136136
@data = {}
137137
@bytes = []
138+
@payload = {}
138139
end
139140

140141
def load(zk)
141142
arr = zk.get("#{dir}/#{@id}")
142143
return if arr.nil?
143144
payload = arr[0]
144145
@bytes = payload.nil? ? [] : payload.bytes
146+
@payload = payload_object
145147
end
146148

147149
def status_name

0 commit comments

Comments
 (0)