mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return an 5XX error when an exception is raise (#15285)

Browse Source
This commit is contained in:
Pelt10
2023-09-06 20:41:13 +02:00
committed by GitHub
parent d991a4b505
commit 6d4e1f8d93
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
LibreNMS/Exceptions/DatabaseConnectException.php
View File

@@ -60,9 +60,9 @@ class DatabaseConnectException extends \Exception implements UpgradeableExceptio
return $request->wantsJson() ? response()->json([
'status' => 'error',
'message' => "$title: " . $this->getMessage(),
]) : response()->view('errors.generic', [
], 503) : response()->view('errors.generic', [
'title' => $title,
'content' => $this->getMessage(),
]);
], 503);
}
}

4
LibreNMS/Exceptions/DatabaseInconsistentException.php
View File

@@ -79,8 +79,8 @@ class DatabaseInconsistentException extends \Exception implements UpgradeableExc
return $request->wantsJson() ? response()->json([
'status' => 'error',
'message' => $message,
]) : response()->view('errors.db_inconsistent', [
], 500) : response()->view('errors.db_inconsistent', [
'results' => $this->validationResults,
]);
], 500);
}
}

4
LibreNMS/Exceptions/DuskUnsafeException.php
View File

@@ -55,9 +55,9 @@ class DuskUnsafeException extends \Exception implements UpgradeableException
return $request->wantsJson() ? response()->json([
'status' => 'error',
'message' => "$title: $message",
]) : response()->view('errors.generic', [
], 500) : response()->view('errors.generic', [
'title' => $title,
'content' => $message,
]);
], 500);
}
}

4
LibreNMS/Exceptions/FileWriteFailedException.php
View File

@@ -51,9 +51,9 @@ class FileWriteFailedException extends \Exception
return $request->wantsJson() ? response()->json([
'status' => 'error',
'message' => "$title: $message",
]) : response()->view('errors.generic', [
], 500) : response()->view('errors.generic', [
'title' => $title,
'content' => $message,
]);
], 500);
}
}

4
LibreNMS/Exceptions/LdapMissingException.php
View File

@@ -50,9 +50,9 @@ class LdapMissingException extends AuthenticationException
return $request->wantsJson() ? response()->json([
'status' => 'error',
'message' => "$title: $message",
]) : response()->view('errors.generic', [
], 500) : response()->view('errors.generic', [
'title' => $title,
'content' => $message,
]);
], 500);
}
}

4
LibreNMS/Exceptions/MaximumExecutionTimeExceeded.php
View File

@@ -64,9 +64,9 @@ class MaximumExecutionTimeExceeded extends \Exception implements UpgradeableExce
return $request->wantsJson() ? response()->json([
'status' => 'error',
'message' => "$title: $message",
]) : response()->view('errors.generic', [
], 500) : response()->view('errors.generic', [
'title' => $title,
'content' => $message,
]);
], 500);
}
}

4
LibreNMS/Exceptions/UnserializableRouteCache.php
View File

@@ -72,9 +72,9 @@ class UnserializableRouteCache extends \Exception implements UpgradeableExceptio
return $request->wantsJson() ? response()->json([
'status' => 'error',
'message' => "$title: $message",
]) : response()->view('errors.generic', [
], 500) : response()->view('errors.generic', [
'title' => $title,
'content' => $message,
]);
], 500);
}
}