mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Rename ServiceUnavailableException & alter maintenance

Browse source
This commit is contained in:
Philipp Holzer 2019-05-04 16:22:47 +02:00
parent 62fd5375dc
commit 9fb111bca2
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.php
View file

@ -988,7 +988,7 @@ class App
header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string); header('Refresh: 120; url=' . $this->getBaseURL() . "/" . $this->query_string);
Module\Special\HTTPException::rawContent( 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
View file

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

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

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