summaryrefslogtreecommitdiffstats
path: root/inc/taskmanagercallback.inc.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/taskmanagercallback.inc.php')
-rw-r--r--inc/taskmanagercallback.inc.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/inc/taskmanagercallback.inc.php b/inc/taskmanagercallback.inc.php
index ab8affac..8e253962 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(
@@ -136,7 +136,7 @@ class TaskmanagerCallback
$mod = Module::get('sysconfig');
if ($mod === false)
return;
- $mod->activate();
+ $mod->activate(1, false);
if (Taskmanager::isFailed($task)) {
ConfigModule::generateFailed($task, $args);
} else {
@@ -155,7 +155,7 @@ class TaskmanagerCallback
$mod = Module::get('sysconfig');
if ($mod === false)
return;
- $mod->activate();
+ $mod->activate(1, false);
if (Taskmanager::isFailed($task)) {
ConfigTgz::generateFailed($task, $args);
} else {
@@ -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'])) {