Changeset a618ea6

Timestamp:

2010-12-13T03:37:30Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

988d75c, eeab8bc

Parents:

451f121

Message:

new testcase

Location:

skype

Files:

• skyped.py (modified) (4 diffs)
• t/irssi/skype-call.test (added)

skype/skyped.py

@@ -38 +38 @@
 
 def eh(type, value, tb):
+        global options
+
         if type != KeyboardInterrupt:
                 print_exception(type, value, tb)
         gobject.MainLoop().quit()
+        options.conn.close()
         # shut down client if it's running
         try:
@@ -75 +78 @@
         return True
 
+def send(sock, txt):
+        from time import sleep
+        count = 1
+        done = False
+        while (not done) and (count < 10):
+                try:
+                        sock.send(txt)
+                        done = True
+                except Exception, s:
+                        count += 1
+                        dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, count))
+                        sleep(1)
+        if not done:
+                options.conn.close()
+
 def bitlbee_idle_handler(skype):
         if options.conn:
                 try:
                         e = "PING"
-                        options.conn.send("%s\n" % e)
+                        send(options.conn, "%s\n" % e)
                 except Exception, s:
                         dprint("Warning, sending '%s' failed (%s)." % (e, s))
@@ -137 +155 @@
         if options.debug:
                 print now + ": " + msg
+                sys.stdout.flush()
         if options.log:
                 sock = open(options.log, "a")
@@ -172 +191 @@
                         if options.conn:
                                 try:
-                                        options.conn.send(e + "\n")
+                                        send(options.conn, e + "\n")
                                 except Exception, s:
                                         dprint("Warning, sending '%s' failed (%s)." % (e, s))