Skip to content

Commit 16298a8

Browse files
committed
upsert_decor
1 parent 3f4946a commit 16298a8

2 files changed

Lines changed: 23 additions & 19 deletions

File tree

src/tasks/utils/cnf_manager/points.cr

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ module CNFManager
275275
{max_points, max_passed}
276276
end
277277

278-
def self.upsert_task(task, status, points, start_time)
278+
def self.upsert_task(task, status, points, start_time, message)
279279
logger = @@logger.for("upsert_task-#{task}")
280280

281281
# Raise exception when results file does not exists.
@@ -293,7 +293,7 @@ module CNFManager
293293
# So encode it into YAML and parse it back again to assign it.
294294
#
295295
# Only add task timestamps if the env var is set.
296-
if ENV.has_key?("TASK_TIMESTAMPS")
296+
if status == "passed"
297297
task_result_info = {
298298
name: task,
299299
status: status,
@@ -304,12 +304,16 @@ module CNFManager
304304
task_runtime: "#{task_runtime}",
305305
}
306306
result_items << YAML.parse(task_result_info.to_yaml)
307-
else
307+
else
308308
task_result_info = {
309-
name: task,
310-
status: status,
311-
type: task_type_by_task(task),
312-
points: points,
309+
name: task,
310+
status: status,
311+
status_description: message,
312+
type: task_type_by_task(task),
313+
points: points,
314+
start_time: start_time,
315+
end_time: end_time,
316+
task_runtime: "#{task_runtime}",
313317
}
314318
result_items << YAML.parse(task_result_info.to_yaml)
315319
end
@@ -329,17 +333,17 @@ module CNFManager
329333
end
330334

331335
def self.failed_task(task, msg)
332-
upsert_task(task, FAILED, task_points(task, false), start_time)
336+
upsert_task(task, FAILED, task_points(task, false), start_time, msg)
333337
stdout_failure "#{msg}"
334338
end
335339

336340
def self.passed_task(task, msg)
337-
upsert_task(task, PASSED, task_points(task), start_time)
341+
upsert_task(task, PASSED, task_points(task), start_time, msg)
338342
stdout_success "#{msg}"
339343
end
340344

341345
def self.skipped_task(task, msg)
342-
upsert_task(task, SKIPPED, task_points(task), start_time)
346+
upsert_task(task, SKIPPED, task_points(task), start_time, msg)
343347
stdout_success "#{msg}"
344348
end
345349

src/tasks/utils/utils.cr

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,37 +208,37 @@ def upsert_decorated_task(task, status : CNFManager::ResultStatus, message, star
208208
end
209209

210210
def upsert_failed_task(task, message, start_time)
211-
CNFManager::Points.upsert_task(task, FAILED, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Failed), start_time)
211+
CNFManager::Points.upsert_task(task, FAILED, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Failed), start_time, message)
212212
stdout_failure message
213213
message
214214
end
215215

216216
def upsert_passed_task(task, message, start_time)
217-
CNFManager::Points.upsert_task(task, PASSED, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Passed), start_time)
217+
CNFManager::Points.upsert_task(task, PASSED, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Passed), start_time, message)
218218
stdout_success message
219219
message
220220
end
221221

222222
def upsert_skipped_task(task, message, start_time)
223-
CNFManager::Points.upsert_task(task, SKIPPED, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Skipped), start_time)
223+
CNFManager::Points.upsert_task(task, SKIPPED, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Skipped), start_time, message)
224224
stdout_warning message
225225
message
226226
end
227227

228228
def upsert_na_task(task, message, start_time)
229-
CNFManager::Points.upsert_task(task, NA, CNFManager::Points.task_points(task, CNFManager::ResultStatus::NA), start_time)
229+
CNFManager::Points.upsert_task(task, NA, CNFManager::Points.task_points(task, CNFManager::ResultStatus::NA), start_time, message)
230230
stdout_warning message
231231
message
232232
end
233233

234234
def upsert_error_task(task, message, start_time)
235-
CNFManager::Points.upsert_task(task, ERROR, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Error), start_time)
236-
stdout_error message
237-
message
238-
end
235+
CNFManager::Points.upsert_task(task, ERROR, CNFManager::Points.task_points(task, CNFManager::ResultStatus::Error), start_time, message)
236+
stdout_error message
237+
message
238+
end
239239

240240
def upsert_dynamic_task(task, status : CNFManager::ResultStatus, message, start_time)
241-
CNFManager::Points.upsert_task(task, status.to_s.downcase, CNFManager::Points.task_points(task, status), start_time)
241+
CNFManager::Points.upsert_task(task, status.to_s.downcase, CNFManager::Points.task_points(task, status), start_time, message)
242242
case status.to_s.downcase
243243
when /pass/
244244
stdout_success message

0 commit comments

Comments
 (0)