mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-16 17:53:08 +09:00
feature #203: Solving newline on some RM log messages
This commit is contained in:
1 parent
0659115f70
commit
c322e7c3ea
5 files changed
+8
-12
No files matched your search
@@ -19,8 +19,6 @@ require 'OpenNebula/User'
|
||||
require 'OpenNebula/UserPool'
|
||||
require 'OpenNebula/Host'
|
||||
require 'OpenNebula/HostPool'
|
||||
require 'OpenNebula/Cluster'
|
||||
require 'OpenNebula/ClusterPool'
|
||||
|
||||
module OpenNebula
|
||||
|
||||
|
||||
@@ -148,8 +148,8 @@ error_vm_get:
|
||||
goto error_common;
|
||||
|
||||
error_state:
|
||||
oss.str(action_error(method_name, "MANAGE", "VM", vid, rc));
|
||||
oss << " Reason: VM in wrong state.";
|
||||
oss << action_error(method_name, "MANAGE", "VM", vid, rc)
|
||||
<< ". Reason: VM in wrong state.";
|
||||
goto error_common_lock;
|
||||
|
||||
error_authenticate:
|
||||
|
||||
@@ -168,8 +168,8 @@ error_history:
|
||||
goto error_common_lock;
|
||||
|
||||
error_state:
|
||||
oss.str(action_error(method_name, "MANAGE", "VM", vid, rc));
|
||||
oss << " Reason: VM in wrong state.";
|
||||
oss << action_error(method_name, "MANAGE", "VM", vid, rc)
|
||||
<< ". Reason: VM in wrong state.";
|
||||
goto error_common_lock;
|
||||
|
||||
error_common_lock:
|
||||
|
||||
@@ -113,17 +113,15 @@ error_authorize:
|
||||
goto error_common;
|
||||
|
||||
error_duplicate:
|
||||
oss.str(action_error(method_name, "CREATE", "USER", NULL, NULL));
|
||||
oss << " Reason: Existing user, cannot duplicate.";
|
||||
oss << action_error(method_name, "CREATE", "USER", NULL, NULL)
|
||||
<< ". Reason: Existing user, cannot duplicate.";
|
||||
goto error_common;
|
||||
|
||||
|
||||
error_allocate:
|
||||
oss.str(action_error(method_name, "CREATE", "USER", NULL, rc));
|
||||
goto error_common;
|
||||
|
||||
error_common:
|
||||
|
||||
arrayData.push_back(xmlrpc_c::value_boolean(false)); // FAILURE
|
||||
arrayData.push_back(xmlrpc_c::value_string(oss.str()));
|
||||
|
||||
|
||||
@@ -105,8 +105,8 @@ void RequestManager::UserDelete::execute(
|
||||
return;
|
||||
|
||||
error_oneadmin_deletion:
|
||||
oss.str(action_error(method_name, "DELETE", "USER", uid, NULL));
|
||||
oss << " Reason: Oneadmin cannot be deleted.";
|
||||
oss << action_error(method_name, "DELETE", "USER", uid, NULL)
|
||||
<< ". Reason: Oneadmin cannot be deleted.";
|
||||
goto error_common;
|
||||
|
||||
error_authenticate:
|
||||
|
||||
Reference in new issue
Block a user