Changeset 323 for py-tcpmultiplexer

Timestamp:

Jul 19, 2011, 10:11:40 PM (13 years ago)

Author:

Rick van der Zwet

Message:

Get Socket Timeout to make sure to continue quickly.

File:

• py-tcpmultiplexer/TCPMultiplexer.py (modified) (9 diffs)

py-tcpmultiplexer/TCPMultiplexer.py

@@ -12 +12 @@
 import argparse
 import logging
+import os
+import socket
 import sys
 import threading
 import time
 import urllib2
-import os
 
 # Some boring defaults
@@ -23 +24 @@
 DEFAULT_CONFIG = 'streams.yaml'
 DEFAULT_DOCUMENTROOT = './htdocs'
+DEFAULT_TIMEOUT = 2
 
 
@@ -30 +32 @@
   '/cam1/audio' : 'http://172.16.0.67:8080/audio.wav',
   }
+
 
 # Global variables used as ring-buffers or shared-storage
@@ -95 +98 @@
           del urldata[urlid][self]
 
+
+
 def get_data(url, urlid, *args):
+  """ Fetch the DATA from the WAV or MJPEG Stream """
   global running, dataheader, urlheader, urldata
   logger = logging.getLogger('recv_id=' + urlid)
@@ -101 +107 @@
   logger.info("Starting thread '%s' (%s)", url, urlid)
   while running:
+    urlheader[urlid] = None
+    dataheader[urlid] = None
+    urldata[urlid] = None
     try:
       f = urllib2.urlopen(url)
       urlheader[urlid] = ''.join(f.info().headers)
       urldata[urlid] = dict()
+
+      # Find datatype
       datatype = None
       urltype = f.info().gettype()
@@ -112 +123 @@
       elif urltype == 'multipart/x-mixed-replace':
         datatype = 'mjpeg'
+
+      # Be verbose to the user
+      if datatype:
+        logger.info("'%s' Identified as %s", url, datatype)
       else:
         logger.warning("Cannot find file type of '%s'", url)
 
-      if datatype:
-        logger.info("'%s' Identified as %s", url, datatype)
-
+      # Set the correct data header
       if datatype == 'wav':
         # WAV header
@@ -147 +160 @@
       while running:
         data = f.read(10000)
+        # logger.debug("Received data chunk with length: %s", len(data))
         for key in urldata[urlid].keys():
           urldata[urlid][key].append(data)
@@ -164 +178 @@
   parser.add_argument('--host', dest='host', default=DEFAULT_HOST, help='Listen to IP [default: %s]' % DEFAULT_HOST)
   parser.add_argument('--port', dest='port', default=DEFAULT_PORT, type=int, help='Listen to PORT [default: %s]' % DEFAULT_PORT)
+  parser.add_argument('--timeout', dest='timeout', default=DEFAULT_TIMEOUT, type=int, help='Default socket timeout [default: %s]' % DEFAULT_TIMEOUT)
   parser.add_argument('--stream-cfg', dest='stream_cfg', default=DEFAULT_CONFIG, help='YAML Stream configuration [default: %s]' % DEFAULT_CONFIG)
   parser.add_argument('--document-root', dest='document_root', default=DEFAULT_DOCUMENTROOT, help='Document Root File Directory [default: %s]' % DEFAULT_DOCUMENTROOT)
@@ -170 +185 @@
   document_root = os.path.abspath(os.path.join(os.path.dirname(__file__),args.document_root))
   logging.info("Serving '/htdocs' from document_root '%s'", document_root)
+
+  # Set the timeout
+  socket.setdefaulttimeout(args.timeout)
 
   # Inport streams