listener: Drop support for try_again and add proceed command

Signed-off-by: Jonathas-Conceicao <[email protected]>

Author: Jonathas-Conceicao

.github/workflows/ci.yml

@@ -58,7 +58,7 @@ jobs:
             echo "Unexpected download response"
             exit 2
           fi
-          if [[ "$(echo "error foo" | socat - UNIX-CONNECT:updatehub-statechange.sock)" != "try_again 10" ]]; then
+          if [[ "$(echo "error foo" | socat - UNIX-CONNECT:updatehub-statechange.sock)" != "" ]]; then
             echo "Unexpected error response"
             exit 3
           fi

examples/state_change_listener.py

@@ -33,8 +33,7 @@ def error_callback(error_message, command):
     Callback to be called after receiving an error state.
     """
     print("ERROR: " + error_message)
-    print("Sending the command \"retry in 10 seconds\"...")
-    command.try_again(10)
+    command.proceed()
     print("Done!")
 
 

updatehub/listener.py

@@ -41,12 +41,6 @@ class StateCommand:
     The cancel command message to be sent back to the agent to stop whatever it
     is doing.
     """
-    TRY_AGAIN_MESSAGE = "try_again"
-    """
-    The try_again command message to be sent back to the agent to try again
-    something. This message is also accompanied by a delay integer, expressed
-    in seconds, which is a parameter for the try_again method (see bellow).
-    """
 
     def __init__(self, connection):
         """
@@ -61,19 +55,14 @@ def cancel(self):
         """
         Cancels the current action on the agent.
         """
-        self._send_message(StateCommand.CANCEL_MESSAGE)
+        self._connection.send(StateCommand.CANCEL_MESSAGE.encode())
 
-    def try_again(self, delay):
+    def proceed(self):
         """
-        Tell the agent to try the action again after some time.
-
-        :seconds: the time delay in seconds to try the action again.
+        Tell the agent to proceed with the transition.
         """
-        message = StateCommand.TRY_AGAIN_MESSAGE + " " + str(delay)
-        self._send_message(message)
-
-    def _send_message(self, message):
-        self._connection.send(message.encode())
+        # No message need to be sent to the connection in order to the
+        # agent to proceed handling the current state.
 
 
 class MalformedState(Exception):