diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pg_valve_deal.cpp | 6 | ||||
| -rw-r--r-- | src/pg_valve_maat.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/pg_valve_deal.cpp b/src/pg_valve_deal.cpp index 996aec6..e921335 100644 --- a/src/pg_valve_deal.cpp +++ b/src/pg_valve_deal.cpp @@ -274,7 +274,6 @@ SSCANF_ERROR_NO_t fill_in_region_grule_ip(const char* table_line, one_config_hno iprule->grule.rule_type.pmsk_flag = ((iprule->grule.rule_type.sipmsk_flag||iprule->grule.rule_type.dipmsk_flag) && protocol!=0)?1:0; break; default: - assert(0); return SSCANF_ERROR_PROTOCOL; } @@ -385,7 +384,7 @@ void one_maat_update_callback(int32_t table_id, const char* table_line, void* u_ code = fill_in_region_grule_pool(table_line, &priv.iprule); break; default: - assert(0);return; + return; } if(code!=SSCANF_OK || (check=_wrap_grule_check(&priv.iprule.grule))) { @@ -848,7 +847,7 @@ void onesw_maat_update_callback(int32_t table_id,const char* table_line,void* u_ hash_key.service_id = maat_data->table->service_id; hash_key.table_id = maat_data->table->table_id_key; hash_key.dsetid = dsetid; - hash_key.did = (maat_data->table->parent->parent!=NULL)?did:0; + hash_key.did = did; pthread_rwlock_rdlock(&g_pgvalve_info.rwlock); MESA_htable_search_cb(maat_data->table->hash_handle, (unsigned char *)&hash_key, sizeof(table_hash_key_t), onesw_deal_config_incr_cb, (void*)&priv, &cb_ret); @@ -1063,6 +1062,7 @@ void two_maat_update_callback(int32_t table_id,const char* table_line,void* u_pa MESA_HANDLE_RUNTIME_LOGV2(g_pgvalve_info.log_runtime,RLOG_LV_INFO, MODULE_NAME, "pz_error: table %s invalid line: %s", maat_data->table->table_name, table_line); return ; } + //�����Ķ�����(����)У��ҵ��� if(maat_data->table->parent==NULL && service_to_c3_servtype(service, (limit_rate/10)*10, &priv.gmap_info)) { pz_trans_statistic_count(maat_data->table->service_id, maat_data->table->table_id_key, 1, STAT_FIELD_RERROR); diff --git a/src/pg_valve_maat.cpp b/src/pg_valve_maat.cpp index a04e177..cb59d3a 100644 --- a/src/pg_valve_maat.cpp +++ b/src/pg_valve_maat.cpp @@ -100,7 +100,7 @@ int MaatService::store_latest_version(long long ver) int MaatService::maat_feather_start(void) { char tmp_buffer[1024]; - int ret; + int ret, scan_interval_ms=10; feather = Maat_feather(1, g_pgvalve_info.maat_table_info, g_pgvalve_info.log_runtime); if(feather == NULL) @@ -112,6 +112,7 @@ int MaatService::maat_feather_start(void) ret = Maat_set_feather_opt(feather, MAAT_OPT_STAT_FILE_PATH, tmp_buffer, strlen(tmp_buffer)+1); ret |= Maat_set_feather_opt(feather, MAAT_OPT_STAT_ON, NULL, 0); ret |= Maat_set_feather_opt(feather, MAAT_OPT_PERF_ON, NULL, 0); + ret |= Maat_set_feather_opt(feather, MAAT_OPT_SCANDIR_INTERVAL_MS, &scan_interval_ms, sizeof(scan_interval_ms)); ret |= Maat_set_feather_opt(feather, MAAT_OPT_INSTANCE_NAME, table_relate->instance_name, strlen(table_relate->instance_name)+1); if(strlen(g_pgvalve_info.effective_range)>0) |