Merge branch 'fix/start-tunnel' into feature/terminate-vps

command_daemon/start_tunnel.py

@@ -16,8 +16,8 @@ session_key = sys.argv[5]
 
 if run_command(["ssh", "%s@%s" % (user, host), "-o", "UserKnownHostsFile=/etc/cvm/knownhosts", "-o", "StrictHostKeyChecking=no", "-i", keyfile, "cd /etc/cvm/command_daemon; echo '%s' > session_key && ./command_daemon" % session_key]) == 0:
 	# Make autossh verify the connection is still alive every 10 seconds.
-	os.environ["AUTOSSH_POLL"] = 10
-	os.environ["AUTOSSH_FIRST_POLL"] = 10
+	os.environ["AUTOSSH_POLL"] = "10"
+	os.environ["AUTOSSH_FIRST_POLL"] = "10"
 	
 	if run_command(["autossh", "-f", "-i", keyfile, "-M", str(port + 1), "-o", "UserKnownHostsFile=/etc/cvm/knownhosts", "-o", "StrictHostKeyChecking=no", "%s@%s" % (user, host), "-L", "%s:localhost:3434" % port, "-N"]) == 0:
 		sys.stdout.write("Tunnel established.\n");