X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;ds=sidebyside;f=musicpd.py;h=383ba0983568c93e5bdfc26633059474b0cd6115;hb=refs%2Ftags%2Fv0.4.4;hp=aae85a5f5348e897760cfe4248668a8b58047c68;hpb=a1d6fc6df18bca9a06232a77deecf241f48de92c;p=python-musicpd.git

diff --git a/musicpd.py b/musicpd.py
index aae85a5..383ba09 100644
--- a/musicpd.py
+++ b/musicpd.py
@@ -2,6 +2,7 @@
 # Copyright (C) 2008-2010  J. Alexander Treuman <jat@spatialrift.net>
 # Copyright (C) 2012-2019  Kaliko Jack <kaliko@azylum.org>
 # Copyright (C) 2019       Naglis Jonaitis <naglis@mailbox.org>
+# Copyright (C) 2019       Bart Van Loon <bbb@bbbart.be>
 #
 # python-musicpd is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
@@ -29,6 +30,7 @@ ERROR_PREFIX = "ACK "
 SUCCESS = "OK"
 NEXT = "list_OK"
 VERSION = '0.4.4'
+CONNECTION_TIMEOUT = 5  # seconds before a tcp connection attempt times out
 
 
 def iterator_wrapper(func):
@@ -556,7 +558,9 @@ class MPDClient:
             sock = None
             try:
                 sock = socket.socket(af, socktype, proto)
+                sock.settimeout(CONNECTION_TIMEOUT)
                 sock.connect(sa)
+                sock.settimeout(None)
                 return sock
             except socket.error as socket_err:
                 err = socket_err