Исправлена работа с протоколом

[vpproxy.git] / vlcclient / vlcclient.py

diff --git a/vlcclient/vlcclient.py b/vlcclient/vlcclient.py
index 048fd2ffe40d76bd96c7d29769fb43da465592af..69d9fb92f00507d2b71604ac833d04a4bf741049 100644 (file)
--- a/vlcclient/vlcclient.py
+++ b/vlcclient/vlcclient.py
@@ -98,13 +98,16 @@ class VlcClient(object):
                 pass
 
     def _write(self, message):
                 pass
 
     def _write(self, message):

+
+        logger = logging.getLogger("VlcClient_write")
+

         # Return if in the middle of destroying
         if self._shuttingDown.isSet():
             return
 
         try:
             # Write message
         # Return if in the middle of destroying
         if self._shuttingDown.isSet():
             return
 
         try:
             # Write message

-            print 'VLC command:',message
+            logger.debug('VLC command: ' + message)

             self._socket.write(message + "\r\n")
         except EOFError as e:
             raise VlcException("Vlc Write error! ERROR: " + repr(e))
             self._socket.write(message + "\r\n")
         except EOFError as e:
             raise VlcException("Vlc Write error! ERROR: " + repr(e))


@@ -150,7 +153,8 @@ class VlcClient(object):
             logger.debug("Broadcast stopped")
 
     def startBroadcast(self, stream_name, input, muxer='ts', pre_access='', qtype='default'):
             logger.debug("Broadcast stopped")
 
     def startBroadcast(self, stream_name, input, muxer='ts', pre_access='', qtype='default'):

-        print "Starting broadcast......"
+        logger = logging.getLogger("VlcClient_startBroadcast")
+        logger.debug("Starting broadcast......")

         return self._broadcast(True, stream_name, input, muxer, pre_access, qtype)
 
     def stopBroadcast(self, stream_name):
         return self._broadcast(True, stream_name, input, muxer, pre_access, qtype)
 
     def stopBroadcast(self, stream_name):