diff options
| author | Christian Hofmaier | 2020-10-13 18:24:41 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2020-10-13 18:24:41 +0200 |
| commit | 6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0 (patch) | |
| tree | 1b25330880065efa168cb5c69773d545df7cfc01 /inc/event.inc.php | |
| parent | [locationinfo] add forward link to location module (diff) | |
| parent | [dozmod] Implement deleting orphaned files from vm store (diff) | |
| download | slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.tar.gz slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.tar.xz slx-admin-6ef48b756c51e33f64f74fc9fdd96c9e6f4ff1c0.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/slx-admin
merge branch 'master'
Diffstat (limited to 'inc/event.inc.php')
| -rw-r--r-- | inc/event.inc.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/event.inc.php b/inc/event.inc.php index e5ade41b..2d916b48 100644 --- a/inc/event.inc.php +++ b/inc/event.inc.php @@ -64,7 +64,7 @@ class Event } else { $res = Taskmanager::waitComplete($ipxeId, 5000); if (Taskmanager::isFailed($res)) { - EventLog::failure('Update PXE Menu failed', $res['data']['error']); + EventLog::failure('Update PXE Menu failed', $res['data']['error'] ?? $res['data']['error'] ?? ''); $everythingFine = false; } } @@ -79,7 +79,7 @@ class Event $mountStatus = Taskmanager::waitComplete($mountId, 10000); } if ($mountId !== false && Taskmanager::isFailed($mountStatus)) { - EventLog::failure('Mounting VM store failed', $mountStatus['data']['messages']); + EventLog::failure('Mounting VM store failed', $mountStatus['data']['messages'] ?? ''); $everythingFine = false; } elseif ($mountId !== false && !Taskmanager::isFinished($mountStatus)) { // TODO: Still running - create callback |