X-Git-Url: https://git.rvb.name/vpproxy.git/blobdiff_plain/1aebc74d991c35b7eb82395434d543d44f536089..c5401ae7940c77b3f65eaccfee8493c61478b579:/vphttp.py?ds=inline diff --git a/vphttp.py b/vphttp.py index 7ed52f7..33da300 100644 --- a/vphttp.py +++ b/vphttp.py @@ -138,6 +138,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler): ''' GET request handler ''' + logger = logging.getLogger('http_HTTPHandler') self.clientconnected = True # Don't wait videodestroydelay if error happened @@ -149,6 +150,14 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler): # Connected client IP address self.clientip = self.request.getpeername()[0] + req_headers = self.headers + self.client_data = { + 'ip': self.clientip, + 'forwarded-for': req_headers.get('X-Forwarded-For'), + 'client-agent': req_headers.get('User-Agent'), + 'uuid': uuid.uuid4() + } + if VPConfig.firewall: # If firewall enabled self.clientinrange = any(map(lambda i: ipaddr.IPAddress(self.clientip) \ @@ -190,8 +199,6 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler): def handleRequest(self, headers_only): - self.unic = uuid.uuid4() - # Limit concurrent connections if 0 < VPConfig.maxconns <= VPStuff.clientcounter.total: logger.debug("Maximum connections reached, can't serve this") @@ -222,19 +229,25 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.params.append('0') # Adding client to clientcounter - clients = VPStuff.clientcounter.add(self.reqtype+'\\'+self.path_unquoted, self.clientip, self.unic) + clients = VPStuff.clientcounter.add(self.reqtype+'/'+self.path_unquoted, self.client_data) # If we are the one client, but sucessfully got vp instance from clientcounter, # then somebody is waiting in the videodestroydelay state # Check if we are first client - if VPStuff.clientcounter.get(self.reqtype+'\\'+self.path_unquoted)==1: - logger.debug("First client, should create VLC session") - shouldcreatevp = True - else: - logger.debug("Can reuse existing session") - shouldcreatevp = False - self.vlcid = hashlib.md5(self.reqtype+'\\'+self.path_unquoted).hexdigest() + self.vlcid = hashlib.md5(self.reqtype+'/'+self.path_unquoted).hexdigest() + + try: + if not VPStuff.vlcclient.check_stream(self.vlcid): + logger.debug("First client, should create VLC session") + shouldcreatevp = True + else: + logger.debug("Can reuse existing session") + shouldcreatevp = False + except Exception as e: + logger.error('Plugin exception: ' + repr(e)) + logger.error(traceback.format_exc()) + self.dieWithError() # Send fake headers if this User-Agent is in fakeheaderuas tuple if fakeua: @@ -322,7 +335,12 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler): # Waiting until hangDetector is joined self.hanggreenlet.join() logger.debug("Request handler finished") - + except (vlcclient.VlcException) as e: + logger.error("Exception: " + repr(e)) + VPStuff.vlcerrors = VPStuff.vlcerrors + 1 + logger.error("%s error(s) communicating VLC") + self.errorhappened = True + self.dieWithError() except (vpclient.VPException, vlcclient.VlcException, urllib2.URLError) as e: logger.error("Exception: " + repr(e)) self.errorhappened = True @@ -338,19 +356,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler): finally: logger.debug("END REQUEST") logger.info("Closed connection from " + self.clientip + " path " + self.path) - VPStuff.clientcounter.delete(self.reqtype+'\\'+self.path_unquoted, self.clientip, self.unic) -# if not VPStuff.clientcounter.get(self.reqtype+'\\'+self.path_unquoted): -# try: -# logger.debug("That was the last client, destroying VPClient") -# logger.info("Stopping broadcasting " + self.path) -# VPStuff.vlcclient.stopBroadcast(self.vlcid) -# except vlcclient.VlcException: -# logger.error("VLC connection problem, %s client(s)!" % VPStuff.clientcounter.total) -# if VPStuff.clientcounter.total == 0: -# logger.error("Probably VLC hang") -# VPStuff.vlc.kill() -# except: -# pass + VPStuff.clientcounter.delete(self.reqtype+'/'+self.path_unquoted, self.client_data) self.vp.destroy() class HTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer): @@ -365,6 +371,7 @@ class VPStuff(object): Inter-class interaction class ''' vlcclient=None + vlcerrors=0 # taken from http://stackoverflow.com/questions/2699907/dropping-root-permissions-in-python def drop_privileges(uid_name, gid_name='nogroup'): @@ -447,6 +454,7 @@ DEVNULL = open(os.devnull, 'wb') def spawnVLC(cmd, delay = 0): try: VPStuff.vlc = psutil.Popen(cmd) #, stdout=DEVNULL, stderr=DEVNULL) + VPStuff.vlcerrors = 0 gevent.sleep(delay) return True except: @@ -492,7 +500,18 @@ def clean_proc(): gevent.sleep(1) if isRunning(VPStuff.vlc): # or not :) - VPStuff.vlc.kill() + VPStuff.vlc.terminate() + gevent.sleep(1) + if isRunning(VPStuff.vlc): + VPStuff.vlc.kill() + del VPStuff.vlc + +def restartVLC(cmd, delay = 0): + clean_proc() + if spawnVLC(cmd, delay): + if connectVLC(): + return True + return False # This is what we call to stop the server completely def shutdown(signum = 0, frame = 0): @@ -525,7 +544,8 @@ sched = BackgroundScheduler() sched.start() def clean_streams(): - VPStuff.vlcclient.clean_streams(15) + if VPStuff.vlcclient: + VPStuff.vlcclient.clean_streams(VPConfig.videodestroydelay) job = sched.add_job(clean_streams, 'interval', seconds=15) @@ -551,7 +571,9 @@ try: logger.info("Using VLC %s" % VPStuff.vlcclient._vlcver) logger.info("Server started.") while True: + if not isRunning(VPStuff.vlc): + del VPStuff.vlc if spawnVLC(VPStuff.vlcProc, VPConfig.vlcspawntimeout) and connectVLC(): logger.info("VLC died, respawned it with pid " + str(VPStuff.vlc.pid)) @@ -559,7 +581,18 @@ try: logger.error("Cannot spawn VLC!") clean_proc() sys.exit(1) + # Return to our server tasks server.handle_request() + + if VPStuff.vlcerrors>5: + if restartVLC(VPStuff.vlcProc, VPConfig.vlcspawntimeout): + logger.info("VLC hung, respawned it with pid " + str(VPStuff.vlc.pid)) + else: + logger.error("Cannot spawn VLC!") + clean_proc() + sys.exit(1) + except (KeyboardInterrupt, SystemExit): + sched.shutdown() shutdown()