Commit f6d4fb66 authored by Boxiang Sun's avatar Boxiang Sun

fixup

parent 2386cb66
...@@ -1293,10 +1293,14 @@ stderr_logfile_backups=1 ...@@ -1293,10 +1293,14 @@ stderr_logfile_backups=1
self._checkPromiseList(local_partition) self._checkPromiseList(local_partition)
computer_partition.started() computer_partition.started()
bad_service_list = local_partition.checkOnWatchServiceStatus() bad_service_list = local_partition.checkOnWatchServiceStatus()
for service in bad_service_list:
self.logger.info('On watch service %r is not running' % service)
if len(bad_service_list) > 0: if len(bad_service_list) > 0:
self.logger.removeHandler(partition_file_handler)
for service in bad_service_list:
self.logger.info('On watch service %r is not running' % service)
self.logger.addHandler(partition_file_handler)
raise ChildProcessError("No RUNNING on-watch process founded.") raise ChildProcessError("No RUNNING on-watch process founded.")
self._endInstallationTransaction(computer_partition) self._endInstallationTransaction(computer_partition)
elif computer_partition_state == COMPUTER_PARTITION_STOPPED_STATE: elif computer_partition_state == COMPUTER_PARTITION_STOPPED_STATE:
try: try:
...@@ -1544,21 +1548,11 @@ stderr_logfile_backups=1 ...@@ -1544,21 +1548,11 @@ stderr_logfile_backups=1
except slapos.slap.ResourceNotReady: except slapos.slap.ResourceNotReady:
return '(not ready)' return '(not ready)'
self.logger.info('---------------------------------')
self.logger.info('---------------------------------')
self.logger.info('---------------------------------')
self.logger.info('I want generate an output here!!!')
if promise_error_partition_list: if promise_error_partition_list:
self.logger.info('Finished computer partitions.') self.logger.info('Finished computer partitions.')
for partition, exc in promise_error_partition_list: for partition, exc in promise_error_partition_list:
self.logger.info(' %s[%s]: %s', partition.getId(), getPartitionType(partition), exc) self.logger.info(' %s[%s]: %s', partition.getId(), getPartitionType(partition), exc)
self.logger.info('=================================')
self.logger.info('=================================')
self.logger.info('=================================')
self.logger.info('I want generate an output here!!!')
# Return success value # Return success value
if not clean_run_promise: if not clean_run_promise:
return SLAPGRID_PROMISE_FAIL return SLAPGRID_PROMISE_FAIL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment