Change exception catching logic.

Author: cmltaWt0

parsers/vlt_parser.py

@@ -32,40 +32,34 @@ def vlt_parser(self):
     while True:
         try:
             self.tn = telnetlib.Telnet(HOST)
+            str_all = str(self.tn.read_until(b'\r\r\n\r\n'))
+            try:
+                call_info = self.parse_string(str_all, STR_SEARCH)
+            except (TypeError, ValueError) as e:
+                self.write_log(FILE_ERR, 'Error parsing: ', e)
+            else:
+                if call_info is not None:
+                    result = TEXT + call_info[0] + ' ' + call_info[1]
+
+                    self.CONTACTS_LOCK.acquire(1)
+                    for contact in self.contacts_book:
+                        if call_info[0] == contact.phone:
+                            caller = contact
+                            break
+                    else:
+                        caller = Contact(call_info[0])
+                        self.contacts_book.append(caller)
+                        self.save_contacts()
+                    self.CONTACTS_LOCK.release()
+
+                    self.write_log(FILE_OUT, result + ' ' + str(caller))
+                    view_tk(result + '\n' + str(caller))
         except Exception as e:
             self.write_log(FILE_ERR, 'Connection to server is not available: ', e)
             sleep(5)
-        else:
-            while True:
-                try:
-                    self.tn.sock_avail()
-                except Exception as e:
-                    self.write_log(FILE_ERR, 'Connection is not active.', e)
-                    sleep(5)
-                    self.tn = telnetlib.Telnet(HOST)
-                else:
-                    str_all = str(self.tn.read_until(b'\r\r\n\r\n'))
-                    try:
-                        call_info = self.parse_string(str_all, STR_SEARCH)
-                    except (TypeError, ValueError) as e:
-                        self.write_log(FILE_ERR, 'Error parsing: ', e)
-                    else:
-                        if call_info is not None:
-                            result = TEXT + call_info[0] + ' ' + call_info[1]
-
-                            self.CONTACTS_LOCK.acquire(1)
-                            for contact in self.contacts_book:
-                                if call_info[0] == contact.phone:
-                                    caller = contact
-                                    break
-                            else:
-                                caller = Contact(call_info[0])
-                                self.contacts_book.append(caller)
-                                self.save_contacts()
-                            self.CONTACTS_LOCK.release()
-
-                            self.write_log(FILE_OUT, result + ' ' + str(caller))
-                            view_tk(result + '\n' + str(caller))
+        finally:
+            if self.tn:
+                self.tn.close()
 
 
 class VltParser(threading.Thread):