Commit c8f20307 authored by tbrehm's avatar tbrehm
Browse files

Fixed bug in remoting lib when clients were created and a bug in openvz actions.

parent c161eacd
......@@ -2132,23 +2132,28 @@ class remoting {
//* Get the SQL query
$sql = $app->remoting_lib->getSQL($params,'INSERT',0);
$app->db->query($sql);
if($app->remoting_lib->errorMessage != '') {
$this->server->fault('data_processing_error', $app->remoting_lib->errorMessage);
return false;
}
$app->db->query($sql);
$insert_id = $app->db->insertID();
$this->id = $insert_id;
$this->dataRecord = $params;
$app->plugin->raiseEvent('client:client:on_after_insert',$this);
/*
if($app->db->errorMessage != '') {
$this->server->fault('database_error', $app->db->errorMessage . ' '.$sql);
return false;
}
*/
$insert_id = $app->db->insertID();
//$app->uses('tform');
//* Save changes to Datalog
if($app->remoting_lib->formDef["db_history"] == 'yes') {
......
......@@ -131,18 +131,21 @@ class remoteaction_core_module {
if($veid > 0) {
exec("vzctl start $veid");
}
$this->_actionDone($action['action_id'], 'ok');
}
if ($action['action_type'] == 'openvz_stop_vm') {
$veid = intval($action['action_param']);
if($veid > 0) {
exec("vzctl stop $veid");
}
$this->_actionDone($action['action_id'], 'ok');
}
if ($action['action_type'] == 'openvz_restart_vm') {
$veid = intval($action['action_param']);
if($veid > 0) {
exec("vzctl restart $veid");
}
$this->_actionDone($action['action_id'], 'ok');
}
if ($action['action_type'] == 'openvz_create_ostpl') {
$parts = explode(':',$action['action_param']);
......@@ -155,6 +158,7 @@ class remoteaction_core_module {
exec("mv ".$template_cache_dir."vzdump-openvz-".$veid."*.tgz ".$template_cache_dir.$template_name.".tar.gz");
exec("rm -f ".$template_cache_dir."vzdump-openvz-".$veid."*.log");
}
$this->_actionDone($action['action_id'], 'ok');
/* this action takes so much time,
* we stop executing the actions not to waste more time */
return;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment