Обработка таймаута при закрытии потока.

[vpproxy.git] / vpconfig.py

diff --git a/vpconfig.py b/vpconfig.py
index ca11dd53d8e7b9baabb6b4e1f24af6779033db3d..f26c8ee8b2c86d9633abf5a69f44d6752e72d279 100644 (file)
--- a/vpconfig.py
+++ b/vpconfig.py
@@ -8,14 +8,14 @@ import logging
 class VPConfig():
 
     # Message level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
 class VPConfig():
 
     # Message level (DEBUG, INFO, WARNING, ERROR, CRITICAL)

-    debug = logging.DEBUG
+    debug = logging.WARNING

     # HTTP Server host
     httphost = '0.0.0.0'
     # HTTP Server port
     httpport = 8001
     # If started as root, drop privileges to this user.
     # Leave empty to disable.
     # HTTP Server host
     httphost = '0.0.0.0'
     # HTTP Server port
     httpport = 8001
     # If started as root, drop privileges to this user.
     # Leave empty to disable.

-    vpproxyuser = 'aceproxy'
+    vpproxyuser = 'vpproxy'

     # Enable firewall
     firewall = False
     # Firewall mode. True for blackilst, False for whitelist
     # Enable firewall
     firewall = False
     # Firewall mode. True for blackilst, False for whitelist


@@ -30,22 +30,19 @@ class VPConfig():
     # Maximum concurrent connections (video clients)
     maxconns = 20
     # Logging to a file
     # Maximum concurrent connections (video clients)
     maxconns = 20
     # Logging to a file

-    loggingtoafile = False
+    loggingtoafile = True

     # Path for logs, default is current directory. For example '/tmp/'
     # Path for logs, default is current directory. For example '/tmp/'

-    logpath = ''
+    logpath = '/var/log/vpproxy/'

     #
     # ----------------------------------------------------
     # VLC configuration
     # ----------------------------------------------------
     #
     #
     # ----------------------------------------------------
     # VLC configuration
     # ----------------------------------------------------
     #

-    vlcuse = True
-    # Spawn VLC automaticaly
-    vlcspawn = True

     # VLC cmd line (use `--file-logging --logfile=filepath` to write log)
     # VLC cmd line (use `--file-logging --logfile=filepath` to write log)

-    vlccmd = "vlc -I telnet --clock-jitter -1 --network-caching -1 --sout-mux-caching 2000 --telnet-password admin --telnet-port 4212"
+    vlccmd = "cvlc -I telnet --clock-jitter 0 --network-caching 500 --sout-mux-caching 2000 --telnet-password admin --telnet-port 4212 --http-user-agent=\"SmartLabs/1.5.9\""

     # VLC spawn timeout
     # Adjust this if you get error 'Cannot spawn VLC!'
     # VLC spawn timeout
     # Adjust this if you get error 'Cannot spawn VLC!'

-    vlcspawntimeout = 4
+    vlcspawntimeout = 15

     # VLC host
     vlchost = '127.0.0.1'
     # VLC telnet interface port
     # VLC host
     vlchost = '127.0.0.1'
     # VLC telnet interface port


@@ -67,26 +64,11 @@ class VPConfig():
     vlcmux = 'ts'
     # Force ffmpeg INPUT demuxer in VLC. Sometimes can help.
     vlcforceffmpeg = False
     vlcmux = 'ts'
     # Force ffmpeg INPUT demuxer in VLC. Sometimes can help.
     vlcforceffmpeg = False

-    # Stream start delay for dumb players (in seconds)
-    # !!!
-    # PLEASE set this to 0 if you use VLC
-    # !!!
-    videodelay = 0
-    # Stream send delay after PAUSE/RESUME commands (works only if option
-    # above is enabled)
-    # !!!
-    # PLEASE set this to 0 if you use VLC
-    # !!!
-    videopausedelay = 0
-    # Seek back feature.
-    # Seeks stream back for specified amount of seconds.
-    # Set it to 30 or so.
-    videoseekback = 5

     # Delay before closing connection when client disconnects
     # In seconds.
     # Delay before closing connection when client disconnects
     # In seconds.

-    videodestroydelay = 5
+    videodestroydelay = 30

     # Pre-buffering timeout. In seconds.
     # Pre-buffering timeout. In seconds.

-    videotimeout = 30
+    videotimeout = 45

     #
     # Some video players (mostly STBs and Smart TVs) can generate dummy requests
     # to detect MIME-type or something before playing.
     #
     # Some video players (mostly STBs and Smart TVs) can generate dummy requests
     # to detect MIME-type or something before playing.


@@ -98,5 +80,5 @@ class VPConfig():
     # before the headers sent.
     # We send them 200 OK and MPEG MIME-type right after connection has been initiated
     fakeheaderuas = ('HLS Client/2.0 (compatible; LG NetCast.TV-2012)',
     # before the headers sent.
     # We send them 200 OK and MPEG MIME-type right after connection has been initiated
     fakeheaderuas = ('HLS Client/2.0 (compatible; LG NetCast.TV-2012)',

-                     'Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ LG Browser/5.00.00(+mouse+3D+SCREEN+TUNER; LGE; 42LM670T-ZA; 04.41.03; 0x00000001;); LG NetCast.TV-2012 0'
+                     'Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ LG Browser/5.00.00(+mouse+3D+SCREEN+TUNER; LGE; 42LM670T-ZA; 04.41.03; 0x00000001;); LG NetCast.TV-2012 0',

                      )
                      )