diff options
| author | Simon Rettberg | 2018-03-28 10:33:08 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-03-28 10:33:08 +0200 |
| commit | 21d784d55adeefc63ed23d50fadedd1c463a166a (patch) | |
| tree | 41c66e48e18bcc0bf03d1ced506fe376c1073645 /inc/taskmanagercallback.inc.php | |
| parent | [permissionmanager] fixed tree issue with deselecting parent-permissions (Tic... (diff) | |
| parent | [minilinux] permission 'show' => 'view' (diff) | |
| download | slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.tar.gz slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.tar.xz slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.zip | |
Merge branch 'master' into permission-manager
Diffstat (limited to 'inc/taskmanagercallback.inc.php')
| -rw-r--r-- | inc/taskmanagercallback.inc.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/taskmanagercallback.inc.php b/inc/taskmanagercallback.inc.php index ab8affac..55e01ba2 100644 --- a/inc/taskmanagercallback.inc.php +++ b/inc/taskmanagercallback.inc.php @@ -22,7 +22,7 @@ class TaskmanagerCallback if (is_array($task) && isset($task['id'])) $task = $task['id']; if (!is_string($task)) { - EventLog::warning("addCallback: Not a valid task id: $task"); + EventLog::warning("addCallback: Not a valid task id: $task", print_r(debug_backtrace(), true)); return; } $data = array( @@ -172,7 +172,8 @@ class TaskmanagerCallback Property::setVmStoreConfig($args); return; } - if ($task['data']['exitCode'] > 0) { + // If code is 99 then the script failed to even unmount -- don't change anything + if ($task['data']['exitCode'] != 99) { // Manual mount failed with non-taskmanager related error - reset storage type to reflect situation $data = Property::getVmStoreConfig(); if (isset($data['storetype'])) { |