Merge pull request #79 from bits01/run_command_on_app_fixes

Fixed run_command_on_app issues with size and timeout

Author: martyzz1

heroku3/api.py

@@ -479,7 +479,8 @@ def oauthtoken_create(self, client_secret=None, grant_code=None, grant_type=None
         item = self._resource_deserialize(r.content.decode("utf-8"))
         return OAuthToken.new_from_dict(item, h=self)
 
-    def run_command_on_app(self, appname, command, size=1, attach=True, printout=True, env=None):
+    def run_command_on_app(self, appname, command, size='standard-1x', attach=True, printout=True, env=None,
+                           timeout_secs=60):
         """Run a remote command attach=True if you want to capture the output"""
         if attach:
             attach = True
@@ -497,7 +498,7 @@ def run_command_on_app(self, appname, command, size=1, attach=True, printout=Tru
         dyno = Dyno.new_from_dict(item, h=self)
 
         if attach:
-            output = Rendezvous(dyno.attach_url, printout).start()
+            output = Rendezvous(dyno.attach_url, printout=printout, timeout_secs=timeout_secs).start()
             return output, dyno
         else:
             return dyno

heroku3/rendezvous.py

@@ -12,9 +12,9 @@
 class InvalidResponseFromRendezVous(Exception):
     pass
 
-
-class Rendezvous:
-    def __init__(self, url, printout=False):
+  
+class Rendezvous():
+    def __init__(self, url, printout=False, timeout_secs=29):
         self.url = url
         urlp = urlparse(url)
         self.hostname = urlp.hostname
@@ -26,6 +26,7 @@ def __init__(self, url, printout=False):
         self.cert = os.path.abspath("{0}/data/cacert.pem".format(path))
         self.data = ""
         self.printout = printout
+        self.timeout_secs = timeout_secs
 
     def start(self):
 
@@ -47,7 +48,8 @@ def start(self):
         #    #ssl_version=ssl.PROTOCOL_TLSv1_1
         # )
 
-        ssl_sock.settimeout(30)
+        ssl_sock.settimeout(self.timeout_secs)
+
         ssl_sock.connect((self.hostname, self.port))
         # ssl_sock.setblocking(1)
         ssl_sock.write(self.secret.encode("utf8"))