Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

TableSync: don't raise &on_change, smaller fixes

Browse source 
This addresses PR feedback. The main component in this commit is to
disable &on_change notifications when &backend loads a table from sqlite
on startup.
This commit is contained in:
Johanna Amann 2020-07-17 14:21:27 -07:00
parent 930a5c8ebd
commit 36db9d8369
8 changed files with 43 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Attr.cc
View file

@ -465,7 +465,7 @@ void Attributes::CheckAttr(Attr* a)
}
if ( Find(ATTR_BACKEND) )
{
Error("&broker_store and &backend cannot be used simultaneously");
Error("&backend and &broker_store cannot be used simultaneously");
}
}
// fallthrough
@ -646,7 +646,7 @@ void Attributes::CheckAttr(Attr* a)
Error("&backend only supports one-element set/table indexes");
}
// Only support atomic types for the moment.
// Only support atomic types for the moment, unless explicitly overriden
if ( ! type->AsTableType()->IsSet() &&
! input::Manager::IsCompatibleType(type->AsTableType()->Yield().get(), true) &&
! Find(ATTR_BROKER_STORE_ALLOW_COMPLEX) )
@ -689,6 +689,7 @@ void Attributes::CheckAttr(Attr* a)
Error("&broker_store only supports one-element set/table indexes");
}
// Only support atomic types for the moment, unless explicitly overriden
if ( ! type->AsTableType()->IsSet() &&
! input::Manager::IsCompatibleType(type->AsTableType()->Yield().get(), true) &&
! Find(ATTR_BROKER_STORE_ALLOW_COMPLEX) )