Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-03 07:08:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'origin/topic/jsiwek/missing-plugin'

Browse source 
* origin/topic/jsiwek/missing-plugin:
  Improve error message when failing to activate a plugin.

BIT-1252 #merged
This commit is contained in:
Robin Sommer 2014-09-25 10:54:21 -07:00
commit a98dd29259
7 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aux/binpac

@ -1 +1 @@
Subproject commit 3a4684801aafa0558383199e9abd711650b53af9 Subproject commit b1031e97e1cb57df0e0405a6b5c6d0eb49c32c62

2
aux/bro-aux

@ -1 +1 @@
Subproject commit 9ea20c3905bd3fd5109849c474a2f2b4ed008357 Subproject commit 92dea34b43f4109b97dc2cccda49dbb58c72f77a

2
aux/broccoli

@ -1 +1 @@
Subproject commit 33d0ed4a54a6ecf08a0b5fe18831aa413b437066 Subproject commit 64134bc778b46307180192cff48f0d1f08a874e8

2
aux/broctl

@ -1 +1 @@
Subproject commit 2f808bc8541378b1a4953cca02c58c43945d154f Subproject commit db3f7e375b785ee3ef9795bc4917d396871785ff

2
cmake

@ -1 +1 @@
Subproject commit 03de0cc467d2334dcb851eddd843d59fef217909 Subproject commit 0b22aeb9f30b1edad54c225ef3e431c68750480b

10
src/main.cc
View file

@ -853,9 +853,17 @@ int main(int argc, char** argv)
file_mgr->InitPreScript(); file_mgr->InitPreScript();
broxygen_mgr->InitPreScript(); broxygen_mgr->InitPreScript();
bool missing_plugin = false;
for ( set<string>::const_iterator i = requested_plugins.begin(); for ( set<string>::const_iterator i = requested_plugins.begin();
i != requested_plugins.end(); i++ ) i != requested_plugins.end(); i++ )
plugin_mgr->ActivateDynamicPlugin(*i); {
if ( ! plugin_mgr->ActivateDynamicPlugin(*i) )
missing_plugin = true;
}
if ( missing_plugin )
reporter->FatalError("Failed to activate requested dynamic plugin(s).");
plugin_mgr->ActivateDynamicPlugins(! bare_mode); plugin_mgr->ActivateDynamicPlugins(! bare_mode);

2
testing/scripts/has-writer
View file

@ -3,4 +3,4 @@
# Returns true if Bro has been compiled with support for writer type # Returns true if Bro has been compiled with support for writer type
# $1. The type name must match the plugin name that "bro -N" prints. # $1. The type name must match the plugin name that "bro -N" prints.
bro -N $1 >/dev/null bro -N | grep -q $1 >/dev/null