|
1 | 1 | #!/usr/bin/env python3 |
2 | 2 |
|
3 | 3 | from eessi_data_object import EESSIDataAndSignatureObject |
4 | | -from eessi_task import EESSITask |
| 4 | +from eessi_task import EESSITask, EESSITaskState |
5 | 5 | from eessi_task_description import EESSITaskDescription |
6 | 6 | from eessi_s3_bucket import EESSIS3Bucket |
7 | 7 | from eessi_logging import error, log_function_entry_exit, log_message, LoggingScope, LOG_LEVELS, set_logging_scopes |
@@ -184,22 +184,22 @@ def main(): |
184 | 184 |
|
185 | 185 | log_message(LoggingScope.GROUP_OPS, "INFO", "Created EESSITask: '%s'", task) |
186 | 186 |
|
187 | | -# previous_state = None |
188 | | -# current_state = task.determine_state() |
189 | | -# log_message(LoggingScope.GROUP_OPS, "INFO", "Task '%s' is in state '%s'", |
190 | | -# task_path, current_state.name) |
191 | | -# while (current_state is not None and |
192 | | -# current_state != TaskState.DONE and |
193 | | -# previous_state != current_state): |
194 | | -# previous_state = current_state |
195 | | -# log_message(LoggingScope.GROUP_OPS, "INFO", |
196 | | -# "Task '%s': BEFORE handle(): previous state = '%s', current state = '%s'", |
197 | | -# task_path, previous_state.name, current_state.name) |
198 | | -# current_state = task.handle() |
199 | | -# log_message(LoggingScope.GROUP_OPS, "INFO", |
200 | | -# "Task '%s': AFTER handle(): previous state = '%s', current state = '%s'", |
201 | | -# task_path, previous_state.name, current_state.name) |
202 | | -# |
| 187 | + previous_state = None |
| 188 | + current_state = task.determine_state() |
| 189 | + log_message(LoggingScope.GROUP_OPS, "INFO", "Task '%s' is in state '%s'", |
| 190 | + task_path, current_state.name) |
| 191 | + while (current_state is not None and |
| 192 | + current_state != EESSITaskState.DONE and |
| 193 | + previous_state != current_state): |
| 194 | + previous_state = current_state |
| 195 | + log_message(LoggingScope.GROUP_OPS, "INFO", |
| 196 | + "Task '%s': BEFORE handle(): previous state = '%s', current state = '%s'", |
| 197 | + task_path, previous_state.name, current_state.name) |
| 198 | + current_state = task.handle() |
| 199 | + log_message(LoggingScope.GROUP_OPS, "INFO", |
| 200 | + "Task '%s': AFTER handle(): previous state = '%s', current state = '%s'", |
| 201 | + task_path, previous_state.name, current_state.name) |
| 202 | + |
203 | 203 | except Exception as err: |
204 | 204 | log_message(LoggingScope.ERROR, "ERROR", "Failed to process task '%s': '%s'", task_path, str(err)) |
205 | 205 | continue |
|
0 commit comments