ProVM/remote_ip
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes and cleanups

Browse Source
This commit is contained in:
Aldarien
2023-06-16 22:35:41 -04:00
parent 03d4c243a4
commit 781858a905
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,6 +1,8 @@
FROM php:cli
RUN apt-get update && apt-get install -yq --no-install-recommends cron && rm -r /var/lib/apt/lists/* \
&& docker-php-ext-install pdo_mysql
RUN apt-get update && apt-get install -yq --no-install-recommends cron && rm -r /var/lib/apt/lists/*
RUN docker-php-ext-install pdo_mysql
CMD [ "cron", "-f", "-L", "15" ]
#ENTRYPOINT [ "/app/bin/console" ]
#CMD [ "/app/bin/console", "watch" ]

2
app/common/Command/UpdateIp.php
View File

@ -15,7 +15,7 @@ use ProVM\Service\Remote;
)]
class UpdateIp extends Command
{
public function __construct(protected Remote $service, protected LoggerInterface $logger, ?string $name = 'update')
public function __construct(protected Remote $service, protected LoggerInterface $logger, string $name = 'update')
{
parent::__construct($name);
}

3
app/common/Command/Watch.php
View File

@ -7,6 +7,7 @@ use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use function Safe\shell_exec;
#[AsCommand(
name: 'watch',
@ -14,7 +15,7 @@ use Symfony\Component\Console\Output\OutputInterface;
)]
class Watch extends Command
{
public function __construct(protected string $period, ?string $name = 'watch')
public function __construct(protected string $period, string $name = 'watch')
{
parent::__construct($name);
}

6
app/common/Service/Ipify.php
View File

@ -8,14 +8,14 @@ use function Safe\json_decode;
class Ipify
{
public function __construct(protected ClientInterface $client, protected LoggerInterface $logger) {}
public function __construct(protected ClientInterface $client, protected string $uri, protected LoggerInterface $logger) {}
public function get(): string
{
$this->logger->debug('Getting IP');
$response = $this->client->get('?format=json');
if (round($response->getCode() / 100, 0) !== 2) {
throw new Exception("Could not connect to '{$this->client->base_uri}'");
if (round($response->getStatusCode() / 100, 0) != 2) {
throw new Exception("Could not connect to '{$this->uri}'");
}
$body = $response->getBody();
$json = json_decode($body->getContents());

1
app/setup/setups/services.php
View File

@ -28,6 +28,7 @@ return [
ProVM\Service\Ipify::class => function(ContainerInterface $container) {
return new ProVM\Service\Ipify(
$container->get(Psr\Http\Client\ClientInterface::class),
$container->get('uri'),
$container->get(Psr\Log\LoggerInterface::class)
);
},