We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit cda03ff3 authored by Brion Vibber's avatar Brion Vibber

Set a default 2-second timeout on Geonames web service lookups. After a...

Set a default 2-second timeout on Geonames web service lookups. After a failure, further lookups in the same process will be skipped for the next 60 seconds (also configurable).
Makes a Geonames outage much less disruptive to site operations.
parent 7c3b320a
......@@ -55,9 +55,13 @@ class GeonamesPlugin extends Plugin
public $username = null;
public $token = null;
public $expiry = 7776000; // 90-day expiry
public $timeout = 2; // Web service timeout in seconds.
public $timeoutWindow = 60; // Further lookups in this process will be disabled for N seconds after a timeout.
public $cachePrefix = null; // Optional shared memcache prefix override
// to share lookups between local instances.
protected $lastTimeout = null; // timestamp of last web service timeout
/**
* convert a name into a Location object
*
......@@ -437,9 +441,21 @@ class GeonamesPlugin extends Plugin
function getGeonames($method, $params)
{
if ($this->lastTimeout && (time() - $this->lastTimeout < $this->timeoutWindow)) {
throw new Exception("skipping due to recent web service timeout");
}
$client = HTTPClient::start();
$client->setConfig('connect_timeout', $this->timeout);
$client->setConfig('timeout', $this->timeout);
$result = $client->get($this->wsUrl($method, $params));
try {
$result = $client->get($this->wsUrl($method, $params));
} catch (Exception $e) {
common_log(LOG_ERR, __METHOD__ . ": " . $e->getMessage());
$this->lastTimeout = time();
throw $e;
}
if (!$result->isOk()) {
throw new Exception("HTTP error code " . $result->code);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment