From 882f7186143c337e0f30f4ed2c0415f238ed5c83 Mon Sep 17 00:00:00 2001
From: Kiril Vladimiroff <kiril.vladimiroff@cloudsigma.com>
Date: Fri, 30 May 2014 14:17:57 +0300
Subject: Add timeouts for reading/writing from/to to the serial console

---
 cloudinit/cs_utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cloudinit/cs_utils.py b/cloudinit/cs_utils.py
index 4e53c31a..1db3f110 100644
--- a/cloudinit/cs_utils.py
+++ b/cloudinit/cs_utils.py
@@ -35,6 +35,8 @@ import platform
 
 import serial
 
+READ_TIMEOUT = 60
+WRITE_TIMEOUT = 10
 SERIAL_PORT = '/dev/ttyS1'
 if platform.system() == 'Windows':
     SERIAL_PORT = 'COM2'
@@ -76,7 +78,9 @@ class CepkoResult(object):
         self.result = self._marshal(self.raw_result)
 
     def _execute(self):
-        connection = serial.Serial(SERIAL_PORT)
+        connection = serial.Serial(port=SERIAL_PORT,
+                                   timeout=READ_TIMEOUT,
+                                   writeTimeout=WRITE_TIMEOUT)
         connection.write(self.request)
         return connection.readline().strip('\x04\n')
 
-- 
cgit v1.2.3