Changeset 5a4f22e

Timestamp:

2013-02-11T12:56:04Z (12 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

4da4e9b

Parents:

8e166ae

git-author:

Mike Kazantsev <mk.fraggod@…> (11-02-13 12:56:04)

git-committer:

Miklos Vajna <vmiklos@…> (11-02-13 12:56:04)

Message:

skype: don't do retries on send() on socket errors with gobject

As it's a blocking socket, I imagine there might be only EINTR
errors from signals, which don't seem to be used here.
I think the same tweak can be applied to select() code, but
I don't run it, so no idea if Skype4Py threads might make such loop
necessary there.

File:

• protocols/skype/skyped.py (modified) (1 diff)

protocols/skype/skyped.py

@@ -127 +127 @@
         global options
         if hasgobject:
-                for attempt in xrange(1, tries+1):
-                        try:
-                                sock.sendall(txt)
-                        except Exception, s:
-                                dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, attempt))
-                                time.sleep(1)
-                        else:
-                                break
-                else:
+                if not options.conn: return
+                try:
+                        sock.sendall(txt)
+                except Exception, s:
+                        dprint("Warning, sending '%s' failed (%s)." % (txt, s))
                         options.conn.close()
+                        options.conn = False
         else:
                 for attempt in xrange(1, tries+1):