Merge pull request elastic#411 from Yannick-Polius/feature/disable_lu…

…a_rules_v0 Feature/disable lua rules v0
harper-carroll · Sep 18, 2015 · 400a9a3 · 400a9a3
2 parents 229605a + e048acd
commit 400a9a3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/protofiles/DeepScriptIOMsg.proto b/protofiles/DeepScriptIOMsg.proto
@@ -0,0 +1,11 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.nm.message";
+option java_outer_classname = "DeepScriptIOMessage";
+
+message DeepScriptIOMsg {
+  required string rule = 1;
+  required string location = 2;
+  required bool notify = 3;
+  optional string subscriber = 4;
+}
diff --git a/protofiles/LuaDefinedRule.proto b/protofiles/LuaDefinedRule.proto
@@ -21,6 +21,7 @@ message LuaDefinedRule {
   optional uint64 last_modified_date = 9;
   optional bool visible_and_downloadable = 10;
   optional bool editable = 11;
+  optional string error = 12;
 }
 
 

diff --git a/scripts/buildProtoFiles.sh b/scripts/buildProtoFiles.sh
@@ -81,6 +81,7 @@ cd "$cppSrcDir"
 "$protoc" -I="$protoFileDir":$thirdPartyDir:/usr/include:$DISTDIR/protobuf/include --cpp_out=libprocess "$protoFileDir"/ProcessReply.proto
 "$protoc" -I="$protoFileDir":$thirdPartyDir:/usr/include:$DISTDIR/protobuf/include --cpp_out=libcommand "$protoFileDir"/DriveInfo.proto
 "$protoc" -I="$protoFileDir":$thirdPartyDir:/usr/include:$DISTDIR/protobuf/include --cpp_out=libcommand "$protoFileDir"/LuaDefinedRule.proto
+"$protoc" -I="$protoFileDir":$thirdPartyDir:/usr/include:$DISTDIR/protobuf/include --cpp_out=libcommand "$protoFileDir"/DeepScriptIOMsg.proto
 "$protoc" -I="$protoFileDir":$thirdPartyDir:/usr/include:$DISTDIR/protobuf/include --cpp_out=libcommand "$protoFileDir"/ConfigDefaults.proto
 "$protoc" -I="$protoFileDir":$thirdPartyDir:/usr/include:$DISTDIR/protobuf/include --cpp_out=libcommand "$protoFileDir"/ConfigDefaultsRequest.proto
 "$protoc" -I="$protoFileDir":$thirdPartyDir:/usr/include:$DISTDIR/protobuf/include --cpp_out=libfork "$protoFileDir"/ForkerReply.proto
@@ -111,6 +112,7 @@ mv  libprocess/ProcessRequest.pb.cc  libprocess/ProcessRequest.pb.cpp
 mv  libprocess/ProcessReply.pb.cc  libprocess/ProcessReply.pb.cpp
 mv  libcommand/DriveInfo.pb.cc  libcommand/DriveInfo.pb.cpp
 mv  libcommand/LuaDefinedRule.pb.cc  libcommand/LuaDefinedRule.pb.cpp
+mv  libcommand/DeepScriptIOMsg.pb.cc  libcommand/DeepScriptIOMsg.pb.cpp
 
 mv  libcommand/ConfigDefaults.pb.cc  libcommand/ConfigDefaults.pb.cpp
 mv  libcommand/ConfigDefaultsRequest.pb.cc  libcommand/ConfigDefaultsRequest.pb.cpp