aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

multi-tenant: make less verbose

Browse Source
pull/2384/head
Victor Julien 9 years ago
parent 51bb1f0d77
commit db1c47cb6e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
src/detect-engine.c
Unescape Escape View File

@ -1175,7 +1175,7 @@ static TmEcode DetectEngineThreadCtxInitForMT(ThreadVars *tv, DetectEngineThread
/* set up hash for tenant lookup */ /* set up hash for tenant lookup */
list = master->list; list = master->list;
while (list) { while (list) {
SCLogInfo("tenant-id %u", list->tenant_id); SCLogDebug("tenant-id %u", list->tenant_id);
if (list->tenant_id != 0) { if (list->tenant_id != 0) {
DetectEngineThreadCtx *mt_det_ctx = DetectEngineThreadCtxInitForReload(tv, list, 0); DetectEngineThreadCtx *mt_det_ctx = DetectEngineThreadCtxInitForReload(tv, list, 0);
if (mt_det_ctx == NULL) if (mt_det_ctx == NULL)
@ -1729,7 +1729,7 @@ static int DetectEngineMultiTenantReloadTenant(uint32_t tenant_id, const char *f
char prefix[64]; char prefix[64];
snprintf(prefix, sizeof(prefix), "multi-detect.%d.reload.%d", tenant_id, reload_cnt); snprintf(prefix, sizeof(prefix), "multi-detect.%d.reload.%d", tenant_id, reload_cnt);
reload_cnt++; reload_cnt++;
SCLogInfo("prefix %s", prefix); SCLogDebug("prefix %s", prefix);
if (ConfYamlLoadFileWithPrefix(filename, prefix) != 0) { if (ConfYamlLoadFileWithPrefix(filename, prefix) != 0) {
SCLogError(SC_ERR_INITIALIZATION,"failed to load yaml"); SCLogError(SC_ERR_INITIALIZATION,"failed to load yaml");
@ -1891,7 +1891,7 @@ int DetectEngineMultiTenantSetup(void)
char *handler = NULL; char *handler = NULL;
if (ConfGet("multi-detect.selector", &handler) == 1) { if (ConfGet("multi-detect.selector", &handler) == 1) {
SCLogInfo("multi-tenant selector type %s", handler); SCLogConfig("multi-tenant selector type %s", handler);
if (strcmp(handler, "vlan") == 0) { if (strcmp(handler, "vlan") == 0) {
tenant_selector = master->tenant_selector = TENANT_SELECTOR_VLAN; tenant_selector = master->tenant_selector = TENANT_SELECTOR_VLAN;
@ -1914,7 +1914,7 @@ int DetectEngineMultiTenantSetup(void)
} }
} }
SCMutexUnlock(&master->lock); SCMutexUnlock(&master->lock);
SCLogInfo("multi-detect is enabled (multi tenancy). Selector: %s", handler); SCLogConfig("multi-detect is enabled (multi tenancy). Selector: %s", handler);
/* traffic -- tenant mappings */ /* traffic -- tenant mappings */
ConfNode *mappings_root_node = ConfGetNode("multi-detect.mappings"); ConfNode *mappings_root_node = ConfGetNode("multi-detect.mappings");
@ -1956,7 +1956,7 @@ int DetectEngineMultiTenantSetup(void)
if (DetectEngineTentantRegisterVlanId(tenant_id, (uint32_t)vlan_id) != 0) { if (DetectEngineTentantRegisterVlanId(tenant_id, (uint32_t)vlan_id) != 0) {
goto error; goto error;
} }
SCLogInfo("vlan %u connected to tenant-id %u", vlan_id, tenant_id); SCLogConfig("vlan %u connected to tenant-id %u", vlan_id, tenant_id);
mapping_cnt++; mapping_cnt++;
continue; continue;
@ -2007,7 +2007,7 @@ int DetectEngineMultiTenantSetup(void)
"of %s is invalid", id_node->val); "of %s is invalid", id_node->val);
goto bad_tenant; goto bad_tenant;
} }
SCLogInfo("tenant id: %u, %s", tenant_id, yaml_node->val); SCLogDebug("tenant id: %u, %s", tenant_id, yaml_node->val);
/* setup the yaml in this loop so that it's not done by the loader /* setup the yaml in this loop so that it's not done by the loader
* threads. ConfYamlLoadFileWithPrefix is not thread safe. */ * threads. ConfYamlLoadFileWithPrefix is not thread safe. */

Write Preview
Loading…
Cancel
Save