2 files changed, 4 insertions, 2 deletions

diff --git a/beinc_config_sample.json b/beinc_config_sample.json
index e200689..6266589 100644
--- a/beinc_config_sample.json
+++ b/beinc_config_sample.json
@@ -31,6 +31,7 @@
                 "target_password": "changeme",
                 "target_cert_file": "",
                 "target_timestamp_format": "%H:%M:%S",
+                "socket_timeout": 30,
                 "pm_title_template": "%s @ %S",
                 "pm_message_template": "%m",
                 "cm_title_template": "%c @ %S",
diff --git a/beinc_weechat.py b/beinc_weechat.py
index b66501b..a8082b7 100644
--- a/beinc_weechat.py
+++ b/beinc_weechat.py
@@ -117,6 +117,7 @@ class WeechatTarget(object):
                                                   '%H:%M:%S')
         self.__debug = bool(target_dict.get('debug', False))
         self.__enabled = bool(target_dict.get('enabled', True))
+        self.__socket_timeout = int(target_dict.get('socket_timeout', 30))
 
     @property
     def name(self):
@@ -300,9 +301,9 @@ class WeechatTarget(object):
                 global global_beinc_cert_file
                 global_beinc_cert_file = self.__cert_file
                 opener = urllib2.build_opener(ValidHTTPSHandler)
-                response = opener.open(req)
+                response = opener.open(req, timeout=self.__socket_timeout)
             else:
-                response = urllib2.urlopen(req)
+                response = urllib2.urlopen(req, self.__socket_timeout)
             res_code = response.code
             response.close()
             if res_code == 200: