#2350: apply PR suggestions

src/primaite/simulator/system/applications/database_client.py

@@ -48,6 +48,7 @@ class DatabaseClient(Application):
 
     def execute(self) -> bool:
         """Execution definition for db client: perform a select query."""
+        self.num_executions += 1  # trying to connect counts as an execution
         if self.connections:
             can_connect = self.check_connection(connection_id=list(self.connections.keys())[-1])
         else:
@@ -82,8 +83,6 @@ class DatabaseClient(Application):
         if not self._can_perform_action():
             return False
 
-        self.num_executions += 1  # trying to connect counts as an execution
-
         if not connection_id:
             connection_id = str(uuid4())
 

src/primaite/simulator/system/applications/red_applications/data_manipulation_bot.py

@@ -193,6 +193,8 @@ class DataManipulationBot(Application):
         if not self._can_perform_action():
             _LOGGER.debug("Data manipulation application attempted to execute but it cannot perform actions right now.")
             self.run()
+
+        self.num_executions += 1
         return self._application_loop()
 
     def _application_loop(self) -> bool:
@@ -202,7 +204,6 @@ class DataManipulationBot(Application):
         This is the core loop where the bot sequentially goes through the stages of the attack.
         """
         if not self._can_perform_action():
-            self.num_executions += 1
             return False
         if self.server_ip_address and self.payload:
             self.sys_log.info(f"{self.name}: Running")