acu70920 avoided using agent_watcher in the Windows case because our …

…Windows service already provides this behavior externally

scripts/agent_checker.rb

@@ -203,11 +203,15 @@ def start(options)
           end
         end
 
+        # note that our Windows service monitors rnac and rchk processes
+        # externally and restarts them if they die, so no need to roll our
+        # own cross-monitoring on that platform.
+        use_agent_watcher = !RightScale::Platform.windows?
         EM.run do
           check
-          setup_agent_watcher
+          setup_agent_watcher if use_agent_watcher
         end
-        stop_agent_watcher
+        stop_agent_watcher if use_agent_watcher
 
       rescue SystemExit => e
         raise e

scripts/agent_controller.rb

@@ -185,12 +185,18 @@ def run_command(message, command)
     # === Return
     # true:: Always return true
     def start_agent(agent_name, agent_class = Agent)
-      agent_watcher = AgentWatcher.new( lambda { |s| Log.info(s) }, @options[:pid_dir] )
-      agent_watcher.watch_agent("#{@options[:identity]}-rchk", '/opt/rightscale/bin/rchk', '--start', '--stop')
-      @options[:ready_callback] = Proc.new { agent_watcher.start_watching() }
-
+      # note that our Windows service monitors rnac and rchk processes
+      # externally and restarts them if they die, so no need to roll our
+      # own cross-monitoring on that platform.
+      use_agent_watcher = !RightScale::Platform.windows?
+      agent_watcher     = nil
+      if use_agent_watcher
+        agent_watcher = AgentWatcher.new( lambda { |s| Log.info(s) }, @options[:pid_dir] )
+        agent_watcher.watch_agent("#{@options[:identity]}-rchk", '/opt/rightscale/bin/rchk', '--start', '--stop')
+        @options[:ready_callback] = Proc.new { agent_watcher.start_watching() }
+      end
       super
-      agent_watcher.stop_watching()
+      agent_watcher.stop_watching if use_agent_watcher
     end
 
     # Determine syslog program name based on options