tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-09-25 18:59:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

ImportsourceController: catch the whole block

Browse Source
This commit is contained in:
Thomas Gelf 2020-10-09 11:55:24 +02:00
parent 1705e2e3e5
commit f2461bb7e9
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/controllers/ImportsourceController.php
View File

@ -172,13 +172,13 @@ class ImportsourceController extends ActionController
*/ */
public function fetchAction() public function fetchAction()
{ {
try {
$source = $this->getImportSource(); $source = $this->getImportSource();
$source->checkForChanges(); $source->checkForChanges();
$hook = ImportSourceHook::forImportSource($source); $hook = ImportSourceHook::forImportSource($source);
$data = $hook->fetchData(); $data = $hook->fetchData();
$source->applyModifiers($data); $source->applyModifiers($data);
$filename = sprintf( $filename = sprintf(
"director-importsource-%d_%s.json", "director-importsource-%d_%s.json",
$this->getParam('id'), $this->getParam('id'),
@ -188,7 +188,6 @@ class ImportsourceController extends ActionController
$response->setHeader('Content-Type', 'application/json', true); $response->setHeader('Content-Type', 'application/json', true);
$response->setHeader('Content-disposition', "attachment; filename=$filename", true); $response->setHeader('Content-disposition', "attachment; filename=$filename", true);
$response->sendHeaders(); $response->sendHeaders();
try {
$this->sendJson($this->getResponse(), $data); $this->sendJson($this->getResponse(), $data);
} catch (Exception $e) { } catch (Exception $e) {
$this->sendJsonError($response, $e->getMessage()); $this->sendJsonError($response, $e->getMessage());