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

[vpproxy.git] / vpconfig.py

diff --git a/vpconfig.py b/vpconfig.py
index 05ecbbfa94ca23c899b7b976b1b62c72b31c193a..f26c8ee8b2c86d9633abf5a69f44d6752e72d279 100644 (file)
--- a/vpconfig.py
+++ b/vpconfig.py
@@ -8,7 +8,7 @@ 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
     # HTTP Server host
     httphost = '0.0.0.0'
     # HTTP Server port


@@ -30,7 +30,7 @@ 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/'
     logpath = '/var/log/vpproxy/'
     #
     # Path for logs, default is current directory. For example '/tmp/'
     logpath = '/var/log/vpproxy/'
     #


@@ -38,11 +38,8 @@ class VPConfig():
     # 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 0 --network-caching 500 --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!'
     vlcspawntimeout = 15
     # VLC spawn timeout
     # Adjust this if you get error 'Cannot spawn VLC!'
     vlcspawntimeout = 15


@@ -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.