winlin

refine log, log important to file. 1.0.210

@@ -1086,6 +1086,11 @@ int SrsConfig::parse_options(int argc, char** argv) @@ -1086,6 +1086,11 @@ int SrsConfig::parse_options(int argc, char** argv)
1086 return ret; 1086 return ret;
1087 } 1087 }
1088 1088
  1089 +string SrsConfig::config()
  1090 +{
  1091 + return config_file;
  1092 +}
  1093 +
1089 int SrsConfig::parse_argv(int& i, char** argv) 1094 int SrsConfig::parse_argv(int& i, char** argv)
1090 { 1095 {
1091 int ret = ERROR_SUCCESS; 1096 int ret = ERROR_SUCCESS;
@@ -1564,9 +1569,6 @@ int SrsConfig::check_config() @@ -1564,9 +1569,6 @@ int SrsConfig::check_config()
1564 } 1569 }
1565 } 1570 }
1566 1571
1567 - // show important args.  
1568 - srs_trace("conf: %s, limit: %d", config_file.c_str(), get_max_connections());  
1569 -  
1570 //////////////////////////////////////////////////////////////////////// 1572 ////////////////////////////////////////////////////////////////////////
1571 // check features 1573 // check features
1572 //////////////////////////////////////////////////////////////////////// 1574 ////////////////////////////////////////////////////////////////////////
@@ -323,6 +323,10 @@ public: @@ -323,6 +323,10 @@ public:
323 * parse the cli, the main(argc,argv) function. 323 * parse the cli, the main(argc,argv) function.
324 */ 324 */
325 virtual int parse_options(int argc, char** argv); 325 virtual int parse_options(int argc, char** argv);
  326 + /**
  327 + * get the config file path.
  328 + */
  329 + virtual std::string config();
326 private: 330 private:
327 /** 331 /**
328 * parse each argv. 332 * parse each argv.
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "209" 34 +#define VERSION_REVISION "210"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"
@@ -100,6 +100,7 @@ int main(int argc, char** argv) @@ -100,6 +100,7 @@ int main(int argc, char** argv)
100 #ifdef SRS_AUTO_ARM_UBUNTU12 100 #ifdef SRS_AUTO_ARM_UBUNTU12
101 srs_trace("arm tool chain: "SRS_AUTO_EMBEDED_TOOL_CHAIN); 101 srs_trace("arm tool chain: "SRS_AUTO_EMBEDED_TOOL_CHAIN);
102 #endif 102 #endif
  103 + srs_trace("conf: %s, limit: %d", _srs_config->config().c_str(), _srs_config->get_max_connections());
103 104
104 /** 105 /**
105 * we do nothing in the constructor of server, 106 * we do nothing in the constructor of server,