diff --git a/bin/conf/frag_reassembly_k.conf b/bin/conf/frag_reassembly_k.conf new file mode 100644 index 0000000..40e7490 --- /dev/null +++ b/bin/conf/frag_reassembly_k.conf @@ -0,0 +1,33 @@ +[NETWORK] +RedisClusterSwitch=1 +RedisTimeout=5 + +#cluster mode +RedisBrokers=192.168.10.205:9012 + +[SYSTEM] +WaitQueueNum=1000000 + +ConvergeHashSize=65536 +ConvergeHashElemNum=1048576 +ConvergeHashExpireTime=120 + +[LOG] +#frag reassembly log 整形拼接的所有日志 +FragReassemblyLogLevel=30 +FragReassemblyLogName=./frag_reassembly.log + +#media log +MediaLogLevel=30 +MediaLogName=./frag_reassembly_media.log + +#stat log +StatInterval=30 +StatFile=./frag_reassembly_stat.log +SysinfoInterval=30 +SysinfoFile=./frag_reassembly_sysinfo.log + +#Maat +MaatStatSwitch=0 +MaatPerfSwitch=0 +MaatStatFile=./maat_stat.log diff --git a/bin/conf/main.conf b/bin/conf/main.conf index 3f2ef7a..fc15fd8 100644 --- a/bin/conf/main.conf +++ b/bin/conf/main.conf @@ -232,4 +232,4 @@ capacity=32 cost=32 wlb_report_interval=10 -bfd_recv_port=33082 +bfd_recv_port=0 diff --git a/bin/conf/main_k.conf b/bin/conf/main_k.conf new file mode 100644 index 0000000..b0af249 --- /dev/null +++ b/bin/conf/main_k.conf @@ -0,0 +1,134 @@ +#--------------------------------------------------------------------NETWORK +[NETWORK] +LocalIP=ens33 +FwdIP=ens33 + +#recv bizman param, recv data from sapp +BizmanAckSmoothTime = 10 +BizmanAckAccumulateTime=10 +BizmanAckAccumulateNum=5 +BizmanPort=22082 + +#sapp recv resp msg port +BizmanAckPort=22084 + +#msg port:recv msg +MsgPort=22080 + +#udp socket:send frag +UdpSendIP=127.0.0.1;127.0.0.1; +UdpSendIPNum=2 +UdpSendPort=33082;33083 + +#--------------------------------------------------------------------SYSTEM +[SYSTEM] +#cpz类型 0:AV_PIC 1:voip +CPZTpye=0 + +ThreadNum=1 +BizmanQueueMode=0 +BizmanQueueMaxnum=2000000 + +AsmisSwitch=0 + +#向前端发送节目确认 +AckSwitch=0 + +#IVI去重开关 +IVISwitch=1 + +#index第二次反查时间 +IndexQueryTime=10 +#索引查询定时器回调的最大次数 +IndexQueryTimerCbMaxNum=500 + +#media renew time +RenewTimeMax=7200 +RenewTimeMin=600 +RenewTimeStep=6 + +#节目HASH表 +MediaHashSize=65536 +MediaHashElemNum=1048576 +MediaHashExpireTime=300 + +#元信息选项capIP是否修改 1:改为本地capIP, 0:选项为前端机CapIP +ModifyCapIPSwitch=1 + +#==============================================================VOIP +[VOIP] +VOIPFilterSwitch=0 + +#VOIP survey log 监测日志 +VOIPSurveyLogIP= +VOIPSurveyLogIPNum= +VOIPSurveyLogPort= + +#VOIP total log 全量日志 +VOIPFullLogIP= +VOIPFullLogIPNum= +VOIPFullLogPort= + +#voip log +VOIPLogLevel= 20 +VOIPLogPath= ./log/voip.log + +#--------------------------------------------------------------------LOG +[LOG] +AppName=rssb +StatRemoteSwitch= +StatServerIP= +StatServerPort= + +#field_stat +StatCycle=30 +StatFile=./log/rssb_stat.log + +SysinfoCycle=30 +SysinfoFile=./log/rssb_sysinfo.log + +#log in general +LogLevel= 30 +LogPath= ./log/runtime.log + +#frag msg log +FragLogLevel= 30 +FragLogPath= ./log/frag.log + +#resp msg log +RespLogPath= ./log/survey.log + +#media create log +MediaCreateLogPath= ./log/media_create.log + +#media expire log +MediaExpireLogPath= ./log/media_expire.log + +#--------------------------------------------------------------------DEBUG +[DEBUG] +/*节目进行本地存储*/ +FileStoreSwitch=0 +FileStorePath=./log/file/ + +#1: (reoffset-1)*content-length 0: accoffset +HlsAboffsetInMode=1 + +/*碎片建议无效标志*/ +FragSurveyInvalid=0 + +/*JSON文件写本地*/ +JSONLocalSwitch=0 + +[WLB] +wlb_on=0 +wlb_topic=AV +wlb_group_name=xx +user_tag=xx +health_check_port=52100 +health_check_interval=10 +data_port=30000 +capacity=32 +cost=32 +wlb_report_interval=10 + +bfd_recv_port=0 diff --git a/frag_rssb瀹夎浣跨敤鎵嬪唽.docx b/frag_rssb瀹夎浣跨敤鎵嬪唽.docx index 61f2cba..459e18b 100644 Binary files a/frag_rssb瀹夎浣跨敤鎵嬪唽.docx and b/frag_rssb瀹夎浣跨敤鎵嬪唽.docx differ diff --git a/src/main.c b/src/main.c index a421b70..8748e95 100644 --- a/src/main.c +++ b/src/main.c @@ -574,9 +574,9 @@ int read_conf_and_init(const char* filename) } MESA_load_profile_short_def(filename, "SYSTEM", "BizmanQueueMode", (short*)&g_frag_cfg.bizman_queue_mode, 0); MESA_load_profile_uint_def(filename, "SYSTEM", "BizmanQueueMaxnum", &g_frag_cfg.bizman_queue_maxnum, 2000000); - MESA_load_profile_short_def(filename, "SYSTEM", "AckSwitch", (short*)&g_frag_cfg.ack_switch, 1); + MESA_load_profile_short_def(filename, "SYSTEM", "AckSwitch", (short*)&g_frag_cfg.ack_switch, 0); MESA_load_profile_short_def(filename, "SYSTEM", "IVISwitch", (short*)&g_frag_cfg.IVI_switch, 1); - MESA_load_profile_short_def(filename, "SYSTEM", "AsmisSwitch", (short*)&g_frag_cfg.asmis_switch, 1); + MESA_load_profile_short_def(filename, "SYSTEM", "AsmisSwitch", (short*)&g_frag_cfg.asmis_switch, 0); MESA_load_profile_short_def(filename, "SYSTEM", "IndexQueryTime", (short*)&g_frag_cfg.index_query_timeout, 10); MESA_load_profile_short_def(filename, "SYSTEM", "IndexQueryTimerCbMaxNum", (short*)&g_frag_cfg.index_query_timer_cb_maxtime, 500); @@ -591,7 +591,7 @@ int read_conf_and_init(const char* filename) MESA_load_profile_short_def(filename, "SYSTEM", "RenewTimeStep", (short*)&g_frag_cfg.renew_time_step,0); /*av record*/ - MESA_load_profile_short_def(filename, "SYSTEM", "AVRecordFileSwitch", (short*)&g_frag_cfg.avrecord_switch,1); + MESA_load_profile_short_def(filename, "SYSTEM", "AVRecordFileSwitch", (short*)&g_frag_cfg.avrecord_switch,0); MESA_load_profile_string_def(filename, "SYSTEM", "AVRecordFileRootDir", g_frag_cfg.avrecord_filepath, sizeof(g_frag_cfg.avrecord_filepath),"./AVrecord/"); MESA_load_profile_uint_def(filename, "SYSTEM", "AVRecordFileMaxNum", &g_frag_cfg.avrecord_maxnum,100000); mkdir_r(g_frag_cfg.avrecord_filepath); @@ -642,7 +642,7 @@ int read_conf_and_init(const char* filename) /*monitor hash param*/ MESA_load_profile_uint_def(filename, "SYSTEM", "MonitorHashSize", &hash_size, 1024*1024); MESA_load_profile_uint_def(filename, "SYSTEM", "MonitorHashElemNum", &hash_max_elem_num, 1024*1024*16); - MESA_load_profile_uint_def(filename, "SYSTEM", "MonitorHahsExpireTime", &hash_expire_time, 60*60*12); + MESA_load_profile_uint_def(filename, "SYSTEM", "MonitorHahsExpireTime", &hash_expire_time, 60*2); memset(&hash_args,0,sizeof(MESA_htable_create_args_t)); hash_args.thread_safe = 1; //group lock hash_args.recursive = 1;