Mercurial > public > scc_access / file comparison
comparison: scc_access/scc_access.py
scc_access/scc_access.py
- changeset 57
- 8d487e4e20ae
- parent 55
- c226bda2bb71
- child 60
- 2fe60db870df
equal
deleted
inserted
replaced
| 56:c9df25012168 | 57:8d487e4e20ae |
|---|---|
| 393 sys.exit(1) | 393 sys.exit(1) |
| 394 | 394 |
| 395 logger.info('Measurement %s found.', measurement_id) | 395 logger.info('Measurement %s found.', measurement_id) |
| 396 | 396 |
| 397 if measurement is not None: | 397 if measurement is not None: |
| 398 while measurement.is_running: | 398 while not measurement.has_finished: |
| 399 measurement.log_processing_status() | 399 measurement.log_processing_status() |
| 400 time.sleep(10) | 400 time.sleep(10) |
| 401 measurement, status = self.get_measurement(measurement_id) | 401 measurement, status = self.get_measurement(measurement_id) |
| 402 | 402 |
| 403 logger.info("Measurement processing finished.") | 403 logger.info("Measurement processing finished.") |
| 693 self.system = None | 693 self.system = None |
| 694 self.upload = None | 694 self.upload = None |
| 695 | 695 |
| 696 super().__init__(base_url, dict_response) | 696 super().__init__(base_url, dict_response) |
| 697 | 697 |
| 698 @property | |
| 699 def has_finished(self): | |
| 700 """ Temporary implementation for SCC version 5.2.0, until the API returns a flag indicating if the | |
| 701 processing measurement has finished. """ | |
| 702 if (self.is_running is False) and (self.hirelpp != 0 or self.elpp != 0): | |
| 703 return True | |
| 704 else: | |
| 705 return False | |
| 706 | |
| 698 def log_processing_status(self): | 707 def log_processing_status(self): |
| 699 """ Log module status. """ | 708 """ Log module status. """ |
| 700 logger.info("Measurement is being processed. Status: {}, {}, {}, {}, {}, {}). Please wait.".format( | 709 logger.info("Measurement is being processed. Status: {}, {}, {}, {}, {}, {}). Please wait.".format( |
| 701 self.upload, | 710 self.upload, |
| 702 self.hirelpp, | 711 self.hirelpp, |
