[tor-commits] [chutney/master] TorNet: add updateLastOnionServiceDescStatus

[nickm at torproject.org]

commit 0216ace00a12125896e0a77fec19adf75416d2f5
Author: c <c at chroniko.jp>
Date:   Sun May 17 04:42:16 2020 +0000

    TorNet: add updateLastOnionServiceDescStatus
    
    Like updateLastBootstrapStatus this should make the code cleaner
---
 lib/chutney/TorNet.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 4bd926f..fa268d3 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -851,6 +851,7 @@ class LocalNodeController(NodeController):
     def __init__(self, env):
         NodeController.__init__(self, env)
         self._env = env
+        self.most_recent_oniondesc_status = None
         self.most_recent_bootstrap_status = None
 
     def getNick(self):
@@ -1159,11 +1160,7 @@ class LocalNodeController(NodeController):
     HSV2_KEYWORD = "hidden service v2"
     HSV3_KEYWORD = "hidden service v3"
 
-    def getLastOnionServiceDescStatus(self):
-        """Look through info-level logs for onion service descriptor uploads
-           and return a 3-tuple of percentage complete, the hidden service
-           version, and message.
-        """
+    def updateLastOnionServiceDescStatus(self):
         logfname = self.getLogfile(info=True)
         if not os.path.exists(logfname):
             return (LocalNodeController.MISSING_FILE_CODE,
@@ -1188,7 +1185,14 @@ class LocalNodeController(NodeController):
                     keyword = LocalNodeController.HSV3_KEYWORD
                     message = m_v3.groups()[0]
                     break
-        return (percent, keyword, message)
+        self.most_recent_oniondesc_status = (percent, keyword, message)
+
+    def getLastOnionServiceDescStatus(self):
+        """Look through info-level logs for onion service descriptor uploads
+           and return a 3-tuple of percentage complete, the hidden service
+           version, and message.
+        """
+        return self.most_recent_oniondesc_status
 
     def updateLastBootstrapStatus(self):
         """Look through the logs and cache the last bootstrap message