Author: arkurth
Date: Mon Jun 30 16:21:22 2014
New Revision: 1606824
URL: http://svn.apache.org/r1606824
Log:
VCL-768
Updated Linux.pm::logoff_user to check for exit status 0 or 1 to prevent
warnings from being generated if a user is not logged in.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm?rev=1606824&r1=1606823&r2=1606824&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm Mon Jun 30 16:21:22 2014
@@ -1003,7 +1003,8 @@ sub logoff_user {
notify($ERRORS{'DEBUG'}, 0, "user $user_login_id does not exist
on $computer_node_name");
return 1;
}
- elsif ($exit_status ne '0') {
+ elsif ($exit_status ne '0' && $exit_status ne '1') {
+ # pkill will exit with status = 1 if one or more processes were
killed, and 1 if no processes matched
notify($ERRORS{'WARNING'}, 0, "error occurred attempting to log
off $user_login_id from $computer_node_name, exit status: $exit_status,
output:\n" . join("\n", @$output));
return;
}