Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(puppet-agent): Fixes #9208 - puppet agent windows daemon startup inconsistency. #9338

Closed
wants to merge 1 commit into from
Closed

fix(puppet-agent): Fixes #9208 - puppet agent windows daemon startup inconsistency. #9338

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 15 additions & 32 deletions lib/puppet/util/windows/daemon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,25 +187,6 @@ class Daemon
SetTheServiceStatus.call(SERVICE_STOPPED, NO_ERROR, 0, 0)
end

ThreadProc = FFI::Function.new(:ulong, [:pointer]) do |lpParameter|
ste = FFI::MemoryPointer.new(SERVICE_TABLE_ENTRYW, 2)

s = SERVICE_TABLE_ENTRYW.new(ste[0])
s[:lpServiceName] = FFI::MemoryPointer.from_string('')
s[:lpServiceProc] = lpParameter

s = SERVICE_TABLE_ENTRYW.new(ste[1])
s[:lpServiceName] = nil
s[:lpServiceProc] = nil

# No service to step, no service handle, no ruby exceptions, just terminate the thread..
unless StartServiceCtrlDispatcherW(ste)
return 1
end

return 0
end

# This is a shortcut for Daemon.new + Daemon#mainloop.
#
def self.mainloop
Expand Down Expand Up @@ -255,26 +236,28 @@ def mainloop
raise SystemCallError.new('CreateEvent', FFI.errno)
end

hThread = CreateThread(nil, 0, ThreadProc, Service_Main, 0, nil)
hThread = Thread.new(Service_Main) do |lp_proc|
ste = FFI::MemoryPointer.new(SERVICE_TABLE_ENTRYW, 2)

if hThread == 0
raise SystemCallError.new('CreateThread', FFI.errno)
end
s = SERVICE_TABLE_ENTRYW.new(ste[0])
s[:lpServiceName] = FFI::MemoryPointer.from_string("")
s[:lpServiceProc] = lp_proc

events = FFI::MemoryPointer.new(:pointer, 2)
events.put_pointer(0, FFI::Pointer.new(hThread))
events.put_pointer(FFI::Pointer.size, FFI::Pointer.new(@@hStartEvent))
s = SERVICE_TABLE_ENTRYW.new(ste[1])
s[:lpServiceName] = nil
s[:lpServiceProc] = nil

while (index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT
# No service to step, no service handle, no ruby exceptions, just terminate the thread..
StartServiceCtrlDispatcherW(ste)
end

if index == WAIT_FAILED
raise SystemCallError.new('WaitForMultipleObjects', FFI.errno)
while (index = WaitForSingleObject(@@hStartEvent, 1000)) == WAIT_TIMEOUT
# The thread exited, so the show is off.
raise "Service_Main thread exited abnormally" unless hThread.alive?
end

# The thread exited, so the show is off.
if index == WAIT_OBJECT_0
raise "Service_Main thread exited abnormally"
if index == WAIT_FAILED
raise SystemCallError.new("WaitForSingleObject", FFI.errno)
end

thr = Thread.new do
Expand Down