Dockery/Jump
1
0
Fork 0
mirror of https://github.com/daledavies/jump.git synced 2026-02-23 14:50:46 +01:00
Code Issues Packages Projects Releases Activity

Handle having no sites.json if using docker sites

Browse Source
This commit is contained in:
Dale Davies
2023-04-12 22:36:52 +01:00
parent b74e83b63a
commit b74622396d
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jumpapp/classes/Sites.php
View File

@@ -46,6 +46,7 @@ class Sites {
// Retrieve sites from cache. Load all sites from json file and docker if not
// cached or the cache has expired.
$this->loadedsites = $this->cache->load(cachename: 'sites', callback: function() {
// Load json file first to set defaults.
return array_merge($this->load_sites_from_json(), $this->load_sites_from_docker());
});
@@ -137,7 +138,8 @@ class Sites {
}
/**
* Try to load the list of sites from sites.json.
* Try to load the list of sites from sites.json. Sets defaults if any
* are found, which will then apply to any docker sites.
*
* Throws an exception if the file cannot be loaded, is empty, or cannot
* be decoded to an array,
@@ -147,8 +149,18 @@ class Sites {
*/
private function load_sites_from_json(): array {
$allsites = [];
$rawjson = file_get_contents($this->sitesfilelocation);
$rawjson = @file_get_contents($this->sitesfilelocation);
if ($rawjson === false) {
// If we have been instructed to look for docker sites then
// don't worry about not having a local sites.json file and just
// return an empty $allsites array.
$dockerproxy = $this->config->get('dockerproxyurl');
$dockersocket = $this->config->get('dockersocket');
if ($dockerproxy || $dockersocket) {
return $allsites;
}
// If we are not supposed to have docker sites then complau=in about
// not being able to load a sites.json.
throw new ConfigException('There was a problem loading the sites.json file');
}
if ($rawjson === '') {