From ca02cfe1bf588b76de493a23d09a8a5e05ca9865 Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 10 Apr 2014 16:33:45 +0800 Subject: [PATCH] update server.py --- trunk/research/api-server/server.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index 5586eee46..938434e21 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -329,9 +329,17 @@ class RESTServers(object): def __init__(self): self.__server_ip = "192.168.1.142"; - def GET(self): + ''' + id canbe: + ingest: the ingest demo. + meeting: the meeting demo. + ''' + def GET(self, id=None): enable_crossdomain() - url = "http://%s:8080/live/livestream.html"%(self.__server_ip) + if id == "meeting" + url = "http://%s:8085/players/srs_chat.html?port=1935"%(self.__server_ip) + else: + url = "http://%s:8080/live/livestream.html"%(self.__server_ip) raise cherrypy.HTTPRedirect(url) def POST(self):