From c4d38ad4c56233e3b08324a025336d0671880e0d Mon Sep 17 00:00:00 2001 From: david-sarah Date: Fri, 20 Nov 2009 22:15:43 -0800 Subject: [PATCH] make status of finished operations consistently "Finished" --- src/allmydata/immutable/encode.py | 2 +- src/allmydata/immutable/upload.py | 4 ++-- src/allmydata/mutable/publish.py | 2 +- src/allmydata/mutable/retrieve.py | 2 +- src/allmydata/mutable/servermap.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/allmydata/immutable/encode.py b/src/allmydata/immutable/encode.py index 5629a8b8..bb0b79ee 100644 --- a/src/allmydata/immutable/encode.py +++ b/src/allmydata/immutable/encode.py @@ -637,7 +637,7 @@ class Encoder(object): def done(self, res): self.log("upload done", level=log.OPERATIONAL) - self.set_status("Done") + self.set_status("Finished") self.set_encode_and_push_progress(extra=1.0) # done now = time.time() h_and_c_elapsed = now - self._start_hashing_and_close_timestamp diff --git a/src/allmydata/immutable/upload.py b/src/allmydata/immutable/upload.py index 11f822be..0b3bd7d9 100644 --- a/src/allmydata/immutable/upload.py +++ b/src/allmydata/immutable/upload.py @@ -838,7 +838,7 @@ class LiteralUploader: def _build_results(self, uri): self._results.uri = uri - self._status.set_status("Done") + self._status.set_status("Finished") self._status.set_progress(1, 1.0) self._status.set_progress(2, 1.0) return self._results @@ -1038,7 +1038,7 @@ class AssistedUploader: if "total" in r.timings: r.timings["helper_total"] = r.timings["total"] r.timings["total"] = now - self._started - self._upload_status.set_status("Done") + self._upload_status.set_status("Finished") self._upload_status.set_results(r) return r diff --git a/src/allmydata/mutable/publish.py b/src/allmydata/mutable/publish.py index fd1b66db..e9b68cd7 100644 --- a/src/allmydata/mutable/publish.py +++ b/src/allmydata/mutable/publish.py @@ -820,7 +820,7 @@ class Publish: # TODO: recovery else: self.log("Publish done, success") - self._status.set_status("Done") + self._status.set_status("Finished") self._status.set_progress(1.0) eventually(self.done_deferred.callback, res) diff --git a/src/allmydata/mutable/retrieve.py b/src/allmydata/mutable/retrieve.py index a72e1088..c90d1ce5 100644 --- a/src/allmydata/mutable/retrieve.py +++ b/src/allmydata/mutable/retrieve.py @@ -537,7 +537,7 @@ class Retrieve: self._status.set_status("Failed") else: self.log("Retrieve done, success!") - self._status.set_status("Done") + self._status.set_status("Finished") self._status.set_progress(1.0) # remember the encoding parameters, use them again next time (seqnum, root_hash, IV, segsize, datalength, k, N, prefix, diff --git a/src/allmydata/mutable/servermap.py b/src/allmydata/mutable/servermap.py index c8d684ff..474779a1 100644 --- a/src/allmydata/mutable/servermap.py +++ b/src/allmydata/mutable/servermap.py @@ -1008,7 +1008,7 @@ class ServermapUpdater: self._status.set_finished(now) self._status.timings["total"] = elapsed self._status.set_progress(1.0) - self._status.set_status("Done") + self._status.set_status("Finished") self._status.set_active(False) self._servermap.last_update_mode = self.mode -- 2.45.2