diff --git a/trunk/conf/full.conf b/trunk/conf/full.conf index ffb08b040..82250c703 100644 --- a/trunk/conf/full.conf +++ b/trunk/conf/full.conf @@ -19,8 +19,8 @@ pid ./objs/srs.pid; chunk_size 60000; # the logs dir. # if enabled ffmpeg, each stracoding stream will create a log file. -# default: ./objs/logs -ff_log_dir ./objs/logs; +# default: ./objs +ff_log_dir ./objs; # the log tank, console or file. # if console, print log to console. # if file, write log to file. requires srs_log_file if log to file. diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py index 938434e21..76fcf02cf 100755 --- a/trunk/research/api-server/server.py +++ b/trunk/research/api-server/server.py @@ -336,7 +336,7 @@ class RESTServers(object): ''' def GET(self, id=None): enable_crossdomain() - if id == "meeting" + 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) diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 72e873ec2..4262f2500 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -1933,7 +1933,7 @@ string SrsConfig::get_ffmpeg_log_dir() SrsConfDirective* conf = root->get("ff_log_dir"); if (!conf || conf->arg0().empty()) { - return "./objs/logs"; + return "./objs"; } return conf->arg0();