mirror of
https://codeberg.org/demostf/api.git
synced 2026-06-03 18:04:08 +02:00
better upload error handling
This commit is contained in:
parent
9b1c5e83ff
commit
af6be81db6
3 changed files with 28 additions and 8 deletions
|
|
@ -1,11 +1,11 @@
|
|||
FROM php:7.1-fpm-alpine
|
||||
|
||||
RUN apk add --no-cache postgresql-dev wget autoconf g++ libc-dev make \
|
||||
RUN apk add --no-cache postgresql-dev wget autoconf g++ libc-dev make pcre-dev \
|
||||
&& mkdir -p /app/src \
|
||||
&& docker-php-ext-install pdo_pgsql \
|
||||
&& pecl install apcu \
|
||||
&& docker-php-ext-enable apcu \
|
||||
&& apk del autoconf g++ libc-dev make
|
||||
&& apk del autoconf g++ libc-dev make pcre-dev
|
||||
|
||||
COPY composer.json /app
|
||||
COPY src /app/src
|
||||
|
|
|
|||
|
|
@ -18,6 +18,13 @@ class UploadController extends BaseController {
|
|||
$demo = $this->file('demo');
|
||||
$demoFile = $demo['tmp_name'];
|
||||
|
||||
echo $this->uploadProvider->upload($key, $red, $blu, $name, $demoFile);
|
||||
try {
|
||||
echo $this->uploadProvider->upload($key, $red, $blu, $name, $demoFile);
|
||||
} catch (\Exception $e) {
|
||||
\Flight::response()
|
||||
->status(500)
|
||||
->write($e->getMessage())
|
||||
->send();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace Demostf\API\Demo;
|
||||
|
||||
use GuzzleHttp\Client;
|
||||
use GuzzleHttp\Exception\GuzzleException;
|
||||
|
||||
/**
|
||||
* Wrapper around demo.js parser
|
||||
|
|
@ -18,10 +19,22 @@ class RawParser {
|
|||
}
|
||||
|
||||
public function parse(string $path): ?array {
|
||||
$client = new Client();
|
||||
$response = $client->post($this->parserUrl, [
|
||||
'body' => fopen($path, 'r')
|
||||
]);
|
||||
return json_decode($response->getBody()->getContents(), true);
|
||||
try {
|
||||
$client = new Client();
|
||||
$response = $client->post($this->parserUrl, [
|
||||
'body' => fopen($path, 'r')
|
||||
]);
|
||||
$result = json_decode($response->getBody()->getContents(), true);
|
||||
if (is_null($result)) {
|
||||
throw new \Exception('Failed to parse demo, unexpected result from parser');
|
||||
} else {
|
||||
return $result;
|
||||
}
|
||||
} catch (GuzzleException $e) {
|
||||
if (strpos($e->getMessage(), 'cURL error 52') !== false) {
|
||||
throw new \Exception('Failed to parse demo, can\'t reach demo parser');
|
||||
}
|
||||
throw new \Exception('Failed to parse demo, ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue