Merge pull request #25 from blackducksoftware/fix_file_descriptor_leak

Fix for file descriptor leaks

Author: aruncsengr

lib/ohloh_scm/adapters/bzrlib/bzrlib_pipe_client.rb

@@ -6,7 +6,7 @@ def initialize(repository_url)
     @repository_url = repository_url
     @py_script = File.dirname(__FILE__) + '/bzrlib_pipe_server.py'
   end
-  
+
   def start
     @pid, @stdin, @stdout, @stderr = POSIX::Spawn::popen4 "python #{@py_script}"
     open_repository
@@ -27,8 +27,9 @@ def send_command(cmd)
     # send the command
     @stdin.puts cmd
     @stdin.flush
+    return if cmd == "QUIT"
 
-    # get status on stderr, first letter indicates state, 
+    # get status on stderr, first letter indicates state,
     # remaing value indicates length of the file content
     status = @stderr.read(10)
     flag = status[0,1]
@@ -46,6 +47,7 @@ def send_command(cmd)
 
   def shutdown
     send_command("QUIT")
+    [@stdout, @stdin, @stderr].each { |io| io.close unless io.closed? }
     Process.waitpid(@pid, Process::WNOHANG)
   end
 end

lib/ohloh_scm/adapters/bzrlib_adapter.rb

@@ -5,13 +5,13 @@ module OhlohScm::Adapters
 	class BzrlibAdapter < BzrAdapter
 
     def setup
-      @bzr_client = BzrPipeClient.new(url)
-      @bzr_client.start
+      bzr_client = BzrPipeClient.new(url)
+      bzr_client.start
+      bzr_client
     end
 
     def bzr_client
-      setup unless @bzr_client
-      return @bzr_client
+      @bzr_client ||= setup
     end
 
     def cleanup

lib/ohloh_scm/adapters/hglib/client.rb

@@ -36,6 +36,7 @@ def send_command(cmd)
     # send the command
     @stdin.puts cmd
     @stdin.flush
+    return if cmd == "QUIT"
 
     # get status on stderr, first letter indicates state,
     # remaing value indicates length of the file content
@@ -55,6 +56,7 @@ def send_command(cmd)
 
   def shutdown
     send_command("QUIT")
+    [@stdout, @stdin, @stderr].each { |io| io.close unless io.closed? }
     Process.waitpid(@pid, Process::WNOHANG)
   end
 end