Skip to content

Add retry mechanism and more detailed logging for connection issues #1

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.

Sign up for GitHub

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

Open
danbarker wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add retry mechanism and more detailed logging for connection issues #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Propel/Runtime/Adapter/Pdo/PdoAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ public function getConnection(array $params): PdoConnection
$con = new PdoConnection($dsn, $user, $password, $driverOptions);
$this->initConnection($con, isset($params['settings']) && is_array($params['settings']) ? $params['settings'] : []);
} catch (PDOException $e) {
// Detailed error logging
error_log(sprintf('PDO Connection Error: DSN: %s, Error: %s, Code: %s',
preg_replace('/password=.*?;/', 'password=***;', $dsn),
$e->getMessage(),
$e->getCode()
));
throw new AdapterException('Unable to open PDO connection', 0, $e);
}

Expand Down
63 changes: 44 additions & 19 deletions src/Propel/Runtime/Connection/ConnectionFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,28 +51,53 @@ public static function create(
} else {
$connectionClass = $defaultConnectionClass;
}
try {
$adapterConnection = $adapter->getConnection($configuration);
} catch (AdapterException $e) {
throw new ConnectionException('Unable to open connection', 0, $e);
}
/** @var \Propel\Runtime\Connection\ConnectionInterface $connection */
$connection = new $connectionClass($adapterConnection);

// load any connection options from the config file
// connection attributes are those PDO flags that have to be set on the initialized connection
if (isset($configuration['attributes']) && is_array($configuration['attributes'])) {
foreach ($configuration['attributes'] as $option => $value) {
if (is_string($value) && strpos($value, '::') !== false) {
if (!defined($value)) {
throw new InvalidArgumentException(sprintf('Invalid class constant specified "%s" while processing connection attributes for datasource "%s"', $value, $connection->getName()));

$maxRetries = 2;
$retryCount = 0;
$lastException = null;

while ($retryCount <= $maxRetries) {
try {
$adapterConnection = $adapter->getConnection($configuration);

/** @var \Propel\Runtime\Connection\ConnectionInterface $connection */
$connection = new $connectionClass($adapterConnection);

// load any connection options from the config file
// connection attributes are those PDO flags that have to be set on the initialized connection
if (isset($configuration['attributes']) && is_array($configuration['attributes'])) {
foreach ($configuration['attributes'] as $option => $value) {
if (is_string($value) && strpos($value, '::') !== false) {
if (!defined($value)) {
throw new InvalidArgumentException(sprintf('Invalid class constant specified "%s" while processing connection attributes for datasource "%s"', $value, $connection->getName()));
}
$value = constant($value);
}
$connection->setAttribute($option, $value);
}
$value = constant($value);
}
$connection->setAttribute($option, $value);

return $connection;

} catch (AdapterException $e) {
$lastException = $e;
$retryCount++;

// Log the connection attempt failure
error_log(sprintf('Propel connection attempt %d/%d failed: %s',
$retryCount,
$maxRetries + 1,
$e->getMessage() . ' - ' . ($e->getPrevious() ? $e->getPrevious()->getMessage() : '')
));

if ($retryCount <= $maxRetries) {
// Wait before retrying
usleep(100000); // 100ms
}
}
}

return $connection;

// If we get here, all retries have failed
throw new ConnectionException('Unable to open connection after ' . ($maxRetries + 1) . ' attempts', 0, $lastException);
}
}