-
Notifications
You must be signed in to change notification settings - Fork 1.5k
PHPORM-248 register command subscriber only when logs are enabled #3167
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -48,7 +48,7 @@ class Connection extends BaseConnection | |
*/ | ||
protected $connection; | ||
|
||
private ?CommandSubscriber $commandSubscriber; | ||
private ?CommandSubscriber $commandSubscriber = null; | ||
|
||
/** | ||
* Create a new database connection instance. | ||
|
@@ -65,8 +65,6 @@ public function __construct(array $config) | |
|
||
// Create the connection | ||
$this->connection = $this->createConnection($dsn, $config, $options); | ||
$this->commandSubscriber = new CommandSubscriber($this); | ||
$this->connection->addSubscriber($this->commandSubscriber); | ||
|
||
// Select database | ||
$this->db = $this->connection->selectDatabase($this->getDefaultDatabaseName($dsn, $config)); | ||
|
@@ -141,6 +139,36 @@ public function getDatabaseName() | |
return $this->getMongoDB()->getDatabaseName(); | ||
} | ||
|
||
public function enableQueryLog() | ||
{ | ||
parent::enableQueryLog(); | ||
|
||
$this->commandSubscriber = new CommandSubscriber($this); | ||
$this->connection->addSubscriber($this->commandSubscriber); | ||
} | ||
|
||
public function disableQueryLog() | ||
{ | ||
parent::disableQueryLog(); // TODO: Change the autogenerated stub | ||
|
||
$this->connection->removeSubscriber($this->commandSubscriber); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Needs a safe guard in case no subscriber is registered There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Added a condition to never add or remove the subscriber twice. |
||
$this->commandSubscriber = null; | ||
} | ||
|
||
protected function withFreshQueryLog($callback) | ||
{ | ||
try { | ||
return parent::withFreshQueryLog($callback); | ||
} finally { | ||
// The parent method enable query log using enableQueryLog() | ||
// but disables it by setting $loggingQueries to false. We need to | ||
// remove the subscriber for performance. | ||
if (! $this->loggingQueries) { | ||
$this->disableQueryLog(); | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Get the name of the default database based on db config or try to detect it from dsn. | ||
* | ||
|
This file contains hidden or 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
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.