external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

change ffmpeg log to ./objs

Browse source
This commit is contained in:
winlin 2014-04-10 17:19:49 +08:00
parent ca02cfe1bf
commit 3a26b23fba
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
trunk/conf/full.conf
View file

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

2
trunk/research/api-server/server.py
View file

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

2
trunk/src/app/srs_app_config.cpp
View file

@ -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();