Browse Source

Rename ServiceUnavailableException & alter maintenance

pull/7086/head
Philipp Holzer 3 years ago
parent
commit
9fb111bca2
No known key found for this signature in database GPG Key ID: 517BE60E2CE5C8A5
  1. 2
      src/App.php
  2. 13
      src/Module/Maintenance.php
  3. 2
      src/Network/HTTPException/ServiceUnavailableException.php

2
src/App.php

@ -988,7 +988,7 @@ class App
header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
Module\Special\HTTPException::rawContent(
new HTTPException\ServiceUnavaiableException('The node is currently overloaded. Please try again later.')
new HTTPException\ServiceUnavailableException('The node is currently overloaded. Please try again later.')
);
}

13
src/Module/Maintenance.php

@ -4,8 +4,8 @@ namespace Friendica\Module;
use Friendica\BaseModule;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Network\HTTPException;
use Friendica\Util\Strings;
/**
@ -25,13 +25,8 @@ class Maintenance extends BaseModule
System::externalRedirect($reason, 307);
}
header('HTTP/1.1 503 Service Temporarily Unavailable');
header('Status: 503 Service Temporarily Unavailable');
header('Retry-After: 600');
return Renderer::replaceMacros(Renderer::getMarkupTemplate('maintenance.tpl'), [
'$sysdown' => L10n::t('System down for maintenance'),
'$reason' => $reason
]);
$exception = new HTTPException\ServiceUnavailableException($reason);
$exception->httpdesc = L10n::t('System down for maintenance');
throw $exception;
}
}

2
src/Network/HTTPException/ServiceUnavaiableException.php → src/Network/HTTPException/ServiceUnavailableException.php

@ -4,7 +4,7 @@ namespace Friendica\Network\HTTPException;
use Friendica\Network\HTTPException;
class ServiceUnavaiableException extends HTTPException
class ServiceUnavailableException extends HTTPException
{
protected $code = 503;
}
Loading…
Cancel
Save