diff options
| author | luwenpeng <[email protected]> | 2024-03-29 13:24:33 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2024-03-29 13:24:33 +0800 |
| commit | b0cd1a04cb4cc0ced3b01805f2803ed245ca2bd0 (patch) | |
| tree | 75007c9befe4ce0b555d800beb912703be4934fd | |
| parent | 4490735d6c1e4977aa8c5f665a99195c5df0a617 (diff) | |
SCE适配MAAT变更，删除maat_options_set_rule_effect_interval_msv1.2.13-20240329
| -rw-r--r-- | conf/sce.conf | 1 | ||||
| -rw-r--r-- | platform/src/policy.cpp | 4 | ||||
| -rw-r--r-- | platform/test/test_resource/sce.conf | 1 | ||||
| -rw-r--r-- | test/test_data/conf/sce.conf | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/conf/sce.conf b/conf/sce.conf index e55c239..2071001 100644 --- a/conf/sce.conf +++ b/conf/sce.conf @@ -25,7 +25,6 @@ stat_switch=1 perf_switch=1 scan_detail=0 deferred_load=0 -effect_interval_ms=1000 stat_file=log/maat.fs2 table_info=resource/table_info.conf accept_path=/opt/tsg/etc/tsg_device_tag.json diff --git a/platform/src/policy.cpp b/platform/src/policy.cpp index 7becfc2..bb6cf79 100644 --- a/platform/src/policy.cpp +++ b/platform/src/policy.cpp @@ -36,7 +36,6 @@ struct policy_config int perf_switch; int scan_detail; int deferred_load; - int effect_interval_ms; char data_center[EFFECTIVE_RANGE_MAX_SIZE]; char device_group[EFFECTIVE_RANGE_MAX_SIZE]; @@ -265,7 +264,6 @@ static void policy_enforcer_config(const char *profile, struct policy_config *co MESA_load_profile_int_def(profile, "MAAT", "perf_switch", &(config->perf_switch), 1); MESA_load_profile_int_def(profile, "MAAT", "scan_detail", &(config->scan_detail), 0); MESA_load_profile_int_def(profile, "MAAT", "deferred_load", &(config->deferred_load), 0); - MESA_load_profile_int_def(profile, "MAAT", "effect_interval_ms", &(config->effect_interval_ms), 1000); MESA_load_profile_string_def(profile, "MAAT", "stat_file", config->stat_file, sizeof(config->stat_file), "log/maat.fs2"); MESA_load_profile_string_def(profile, "MAAT", "table_info", config->table_info, sizeof(config->table_info), "resource/table_info.conf"); @@ -292,7 +290,6 @@ static void policy_enforcer_config(const char *profile, struct policy_config *co LOG_DEBUG("%s: MAAT->perf_switch : %d", LOG_TAG_POLICY, config->perf_switch); LOG_DEBUG("%s: MAAT->scan_detail : %d", LOG_TAG_POLICY, config->scan_detail); LOG_DEBUG("%s: MAAT->deferred_load : %d", LOG_TAG_POLICY, config->deferred_load); - LOG_DEBUG("%s: MAAT->effect_interval_ms : %d", LOG_TAG_POLICY, config->effect_interval_ms); LOG_DEBUG("%s: MAAT->stat_file : %s", LOG_TAG_POLICY, config->stat_file); LOG_DEBUG("%s: MAAT->table_info : %s", LOG_TAG_POLICY, config->table_info); @@ -1486,7 +1483,6 @@ struct policy_enforcer *policy_enforcer_create(const char *instance, const char maat_options_set_instance_name(opts, instance); maat_options_set_caller_thread_number(opts, thread_num); maat_options_set_foreign_cont_dir(opts, enforcer->config.foreign_cont_dir); - maat_options_set_rule_effect_interval_ms(opts, enforcer->config.effect_interval_ms); // TODO set enforcer->config.scan_detail // Maat4 is not supported temporarily diff --git a/platform/test/test_resource/sce.conf b/platform/test/test_resource/sce.conf index 253fa95..73c1734 100644 --- a/platform/test/test_resource/sce.conf +++ b/platform/test/test_resource/sce.conf @@ -11,7 +11,6 @@ stat_switch=1 perf_switch=1 scan_detail=0 deferred_load=0 -effect_interval_ms=1000 stat_file=./maat.fs2 table_info=test_resource/table_info.conf accept_path=/opt/tsg/etc/tsg_device_tag.json diff --git a/test/test_data/conf/sce.conf b/test/test_data/conf/sce.conf index a4cb5eb..c3a97ec 100644 --- a/test/test_data/conf/sce.conf +++ b/test/test_data/conf/sce.conf @@ -25,7 +25,6 @@ stat_switch=1 perf_switch=1 scan_detail=0 deferred_load=0 -effect_interval_ms=1000 stat_file=log/maat.fs2 table_info=resource/table_info.conf accept_path=/opt/tsg/etc/tsg_device_tag.json |