openstack
/
fuel-astute
Code Issues Proposed changes

Remove misleading message about pids 

If puppet failed and pid did not remove,
but actual process already finished
we show message:

    "Looks like expecting puppet and actual are different"

Now we will show it only if we have different between
running actual and pid from file.

Change-Id: I74b3d280329f98fd064a78a91024001a948ef6c1
Related-Bug: #1422364
This commit is contained in:
Vladimir Sharshov (warpc) 2015-02-17 14:41:46 +03:00
parent 1f87a9b9a4
commit e048bee5c4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mcagents/puppetd.rb
View File

@ -276,9 +276,11 @@ module MCollective
case actual_pid
when expected_pid then expected_pid
when nil then nil
else
reply[:err_msg] = "Potencial error. Looks like expecting puppet and actual are different. " \
"Expecting pid(lockfile): #{expected_pid}, actual(ps): #{actual_pid}"
reply[:err_msg] = "Potencial error. Looks like expecting puppet " \
"and actual are different. Expecting pid(lockfile): " \
"#{expected_pid}, actual(ps): #{actual_pid}"
actual_pid
end
rescue NoMethodError