(maint) Enable simple tcp server to exit when sent sighup

Previously the Simple TCP server would not exit when a SIGHUP (Ctrl-C) signal
was sent.  This commit changes the stop_services handler so that it is aware
when it is invoked from a TRAP as some operations are not allowed in the TRAP
context.  This commit also updates the trap handlers to use the correct
method name.

Author: glennsarti

server/lib/puppet-debugserver.rb

@@ -78,7 +78,7 @@ def self.rpc_server(options)
     options[:servicename] = 'DEBUG SERVER'
 
     server.add_service(options[:ipaddress], options[:port])
-    trap('INT') { server.stop }
+    trap('INT') { server.stop_services(true) }
     server.start(PuppetDebugServer::MessageRouter, options, 2)
 
     log_message(:info, 'Debug Server exited.')

server/lib/puppet-languageserver.rb

@@ -127,7 +127,7 @@ def self.rpc_server(options)
     options[:servicename] = 'LANGUAGE SERVER'
 
     server.add_service(options[:ipaddress], options[:port])
-    trap('INT') { server.stop }
+    trap('INT') { server.stop_services(true) }
     server.start(PuppetLanguageServer::MessageRouter, options, 2)
 
     log_message(:info, 'Language Server exited.')

server/lib/puppet-vscode/simple_tcp_server.rb

@@ -124,7 +124,7 @@ def start(handler = PuppetVSCode::SimpleTCPServerConnection, connection_options
 
       # Output to STDOUT.  This is required by clients so it knows the server is now running
       self.class.s_locker.synchronize do
-        self.class.services.each do |_service, options|
+        self.class.services.each_value do |options|
           $stdout.write("#{@handler_start_options[:servicename]} RUNNING #{options[:hostname]}:#{options[:port]}\n")
         end
       end
@@ -279,20 +279,30 @@ def add_service(hostname = '127.0.0.1', port = 8081, parameters = {})
     end
 
     # @api public
-    def stop_services
+    def stop_services(from_trap = false)
       log('Stopping services')
-      self.class.s_locker.synchronize do
-        self.class.services.each do |s, p|
-          begin
-            s.close
-          rescue # rubocop:disable Lint/RescueWithoutErrorClass
-            # Swallow all errors
-            true
-          end
-          log("Stopped listening on #{p[:hostname]}:#{p[:port]}")
+      if from_trap
+        # synchronize is not allowed when called from a trap statement
+        stop_all_services
+      else
+        self.class.s_locker.synchronize do
+          stop_all_services
+        end
+      end
+    end
+
+    # @api private
+    def stop_all_services
+      self.class.services.each do |s, p|
+        begin
+          s.close
+        rescue # rubocop:disable Lint/RescueWithoutErrorClass
+          # Swallow all errors
+          true
         end
-        self.class.services.clear
+        log("Stopped listening on #{p[:hostname]}:#{p[:port]}")
       end
+      self.class.services.clear
     end
 
     # @api public