Pass the number of the opened REST API port from Core to GUI #7251
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kozlovsky
requested review from
a team,
drew2a and
xoriole
and removed request for
a team
kozlovsky
commented
Jan 10, 2023
| @@ -176,7 +223,7 @@ def stop(self, quit_app_on_core_finished=True): | |||
| if not self.core_connected: | |||
| # If Core is not connected via events_manager it also most probably cannot process API requests. | |||
| self._logger.warning('Core is not connected during the CoreManager shutdown, killing it...') | |||
| self.kill_core_process_and_remove_the_lock_file() | |||
| self.kill_core_process() | |||
There was a problem hiding this comment.
This renaming should actually be in the previous PR... When I extracted the current PR from the previous one, I missed this line...
drew2a
approved these changes
Jan 10, 2023
| @@ -65,6 +65,16 @@ def __init__(self, api_port, api_key, error_handler): | |||
| notifier.add_observer(notifications.tribler_shutdown_state, self.on_tribler_shutdown_state) | |||
| notifier.add_observer(notifications.report_config_error, self.on_report_config_error) | |||
|
|
|||
| def create_request(self) -> QNetworkRequest: | |||
| url = QUrl("http://localhost:%d/events" % self.api_port) | |||
There was a problem hiding this comment.
NIT
Suggested change
| url = QUrl("http://localhost:%d/events" % self.api_port) | |
| url = QUrl(f'http://localhost:{self.api_port}/events') |
xoriole
reviewed
Jan 10, 2023
src/tribler/gui/core_manager.py
Outdated
| Determines the actual REST API port of the Core process. | ||
|
|
||
| This function is first executed from the `on_core_started` after the physical Core process starts and then | ||
| repeatedly executed after API_PORT_CHECK_INTERVAL seconds until it retrieves the REST API port value from |
There was a problem hiding this comment.
"after API_PORT_CHECK_INTERVAL seconds" --> to avoid any confusion, this is in milliseconds
xoriole
approved these changes
Jan 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is based on @xoriole's PR #7162 and fixes #7137. What is different is the way how GUI determines the opened API port. In the current PR, GUI takes the
api_portvalue from the processes database.Previously, EventRequestManager initially attempted to connect to the already running independently launched Core. Then in case a new Core process is started, EventRequestManager immediately starts repeated attempts to connect to it.
Now, EventRequestManager connects to the launched Core only after the Core REST API manager is started. Before that, CoreManager periodically attempts to read the
api_portvalue from the processes database.In case of a crash, the API port values (an initial value suggested by GUI and an actual value used by Core) are available in the error report as part of process information (in the
last_processessection).