eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2026-02-15 18:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #339 from nextcloud/enh/noid/improve-logging

Browse source 
improve error logging in dockeractionmanager
This commit is contained in:
Simon L 2022-03-16 15:49:00 +01:00 • committed by GitHub
commit 1fc8f2dd0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
php/public/index.php
View file

@ -141,4 +141,6 @@ $app->get('/', function (\Psr\Http\Message\RequestInterface $request, \Psr\Http\
} }
}); });
$errorMiddleware = $app->addErrorMiddleware(true, true, true);
$app->run(); $app->run();

22
php/src/Docker/DockerActionManager.php
View file

@ -281,13 +281,18 @@ class DockerActionManager
} }
$url = $this->BuildApiUrl('containers/create?name=' . $container->GetIdentifier()); $url = $this->BuildApiUrl('containers/create?name=' . $container->GetIdentifier());
$this->guzzleClient->request( try {
'POST', $this->guzzleClient->request(
$url, 'POST',
[ $url,
'json' => $requestBody [
] 'json' => $requestBody
); ]
);
} catch (RequestException $e) {
throw $e;
}
} }
public function PullContainer(Container $container) : void public function PullContainer(Container $container) : void
@ -344,6 +349,7 @@ class DockerActionManager
return null; return null;
} catch (\Exception $e) { } catch (\Exception $e) {
error_log('Could not get digest of container ' . $this->BuildApiUrl($containerName) . ' ' . $e->getMessage());
return null; return null;
} }
} }
@ -365,6 +371,7 @@ class DockerActionManager
apcu_add($cacheKey, $tag); apcu_add($cacheKey, $tag);
return $tag; return $tag;
} catch (\Exception $e) { } catch (\Exception $e) {
error_log('Could not get current channel ' . $e->getMessage());
} }
return 'latest'; return 'latest';
@ -451,6 +458,7 @@ class DockerActionManager
] ]
); );
} catch (RequestException $e) { } catch (RequestException $e) {
error_log('Could not disconnect container from network ' . $e->getMessage());
} }
} }