openshift-origin-node 1.3.1 → 1.3.2

data/lib/openshift-origin-node/utils/shell_exec.rb

@@ -15,6 +15,7 @@
 #++
 
 require 'rubygems'
+require 'timeout'
 require 'open4'
 
 module OpenShift::Utils
@@ -56,9 +57,21 @@ module OpenShift::Utils::ShellExec
       pid, stdin, stdout, stderr = Open4.popen4ext(true, m_cmd)
       begin
         stdin.close
+        out = err = ""
+        fds = [ stdout, stderr ]
+        buffs = { stdout.fileno => out, stderr.fileno => err }
         Timeout::timeout(timeout) do
-          out = stdout.read
-          err = stderr.read
+          while not fds.empty?
+            rs, ws, es = IO.select(fds, nil, nil)
+            rs.each do |f|
+              begin
+                buffs[f.fileno] << f.read_nonblock(4096)
+              rescue IO::WaitReadable, IO::WaitWritable # Wait in next select
+              rescue EOFError
+                fds.delete_if { |item| item.fileno == f.fileno }
+              end
+            end
+          end
         end
       rescue Timeout::Error
         pstree = Hash.new{|a,b| a[b]=[b]}

data/misc/bin/rhcsh

@@ -32,7 +32,7 @@ function welcome {
     !!! IMPORTANT !!! IMPORTANT !!! IMPORTANT !!!
     Shell access is quite powerful and it is possible for you to
     accidentally damage your application.  Proceed with care!
-    If worse comes to worst, destroy your application with 'rhc app destroy'
+    If worse comes to worst, destroy your application with 'rhc app delete'
     and recreate it
     !!! IMPORTANT !!! IMPORTANT !!! IMPORTANT !!!
 

data/rubygem-openshift-origin-node.spec

@@ -12,7 +12,7 @@
 
 Summary:        Cloud Development Node
 Name:           rubygem-%{gem_name}
-Version: 1.3.1
+Version: 1.3.2
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        ASL 2.0
@@ -117,6 +117,7 @@ mv %{buildroot}%{gem_instdir}/misc/doc/cgconfig.conf %{buildroot}%{_docdir}/%{na
   sed -i 's/include/IncludeOptional/g' httpd/000001_openshift_origin_node.conf
 %endif
 mv httpd/000001_openshift_origin_node.conf %{buildroot}/etc/httpd/conf.d/
+mv httpd/000001_openshift_origin_node_servername.conf %{buildroot}/etc/httpd/conf.d/
 
 #%if 0%{?fedora}%{?rhel} <= 6
 mkdir -p %{buildroot}/etc/rc.d/init.d/
@@ -147,6 +148,7 @@ rm -rf %{buildroot}
 %attr(0750,-,-) /etc/httpd/conf.d/openshift
 
 %config(noreplace) /etc/httpd/conf.d/000001_openshift_origin_node.conf
+%config(noreplace) /etc/httpd/conf.d/000001_openshift_origin_node_servername.conf
 %attr(0755,-,-) %{appdir}
 
 #%if 0%{?fedora}%{?rhel} <= 6
@@ -172,6 +174,16 @@ if ! [ -f /etc/openshift/resource_limits.conf ]; then
 fi
 
 %changelog
+* Thu Jan 10 2013 Adam Miller <admiller@redhat.com> 1.3.2-1
+- Merge pull request #1120 from sosiouxme/BZ876324
+  (dmcphers+openshiftbot@redhat.com)
+- BZ876324 resolve ServerName/NameVirtualHost situation for
+  node/broker/ssl.conf (lmeyer@redhat.com)
+- Update rhc command usage. Addresses BZ889018. (asari.ruby@gmail.com)
+- Typo. (rmillner@redhat.com)
+- BZ 888410: The reader sequence can block if there is too much stderr
+  (rmillner@redhat.com)
+
 * Wed Dec 12 2012 Adam Miller <admiller@redhat.com> 1.3.1-1
 - bump_minor_versions for sprint 22 (admiller@redhat.com)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openshift-origin-node
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Krishna Raman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-12 00:00:00 -05:00
+date: 2013-01-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency