change ffmpeg log to ./objs

@@ -19,8 +19,8 @@ pid                 ./objs/srs.pid;
 chunk_size          60000;
 chunk_size          60000;
 # the logs dir.
 # the logs dir.
 # if enabled ffmpeg, each stracoding stream will create a log file.
 # 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.
 # the log tank, console or file.
 # if console, print log to console.
 # if console, print log to console.
 # if file, write log to file. requires srs_log_file if log to file.
 # if file, write log to file. requires srs_log_file if log to file.

@@ -336,7 +336,7 @@ class RESTServers(object):
     '''
     '''
     def GET(self, id=None):
     def GET(self, id=None):
         enable_crossdomain()
         enable_crossdomain()
-        if id == "meeting"
+        if id == "meeting":
             url = "http://%s:8085/players/srs_chat.html?port=1935"%(self.__server_ip)
             url = "http://%s:8085/players/srs_chat.html?port=1935"%(self.__server_ip)
         else:
         else:
             url = "http://%s:8080/live/livestream.html"%(self.__server_ip)
             url = "http://%s:8080/live/livestream.html"%(self.__server_ip)

@@ -1933,7 +1933,7 @@ string SrsConfig::get_ffmpeg_log_dir()
     
     
     SrsConfDirective* conf = root->get("ff_log_dir");
     SrsConfDirective* conf = root->get("ff_log_dir");
     if (!conf || conf->arg0().empty()) {
     if (!conf || conf->arg0().empty()) {
-        return "./objs/logs";
+        return "./objs";
     }
     }
     
     
     return conf->arg0();
     return conf->arg0();