A new protomessage to facilitate better syslog abstraction

harper-carroll · May 29, 2014 · 607bba8 · 607bba8
1 parent a49bdd2
commit 607bba8
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/protofiles/LogMessage.proto b/protofiles/LogMessage.proto
@@ -0,0 +1,25 @@
+package protoMsg;
+
+option java_package = "com.logrhythm.nm.message";
+option java_outer_classname = "LogMessageMsg";
+
+message LogMessage {
+  enum LogType {
+     NORMALIZED = 0;
+     FULL = 1;
+     INTERMEDIATE = 2;
+     DEBUG = 3;
+     SYSTEM = 4;
+     EVENT = 5;
+  }
+  enum SourceType {
+     DPIMSG = 0;
+     JSON = 1;
+     RAW = 2;
+  }
+  optional LogType outputType = 1; 
+  repeated SourceType inputType = 2;
+  repeated string inputData = 3;
+}
+
+
diff --git a/scripts/buildProtoFiles.sh b/scripts/buildProtoFiles.sh
@@ -23,7 +23,7 @@ if [ ! -f "$phpprotoc" ]; then
   sh "$scriptsDir"/getPhpProtobuffers.sh
 fi
 
-mkdir -p "$cppSrcDir"/liblrdpi "$cppSrcDir"/libstats "$cppSrcDir"/libconf $cppSrcDir/libcommand "$cppSrcDir"/libprocess "$cppSrcDir"/liblua "$cppSrcDir"/libtools "$cppSrcDir"/libfork "$cppSrcDir"/liblicense
+mkdir -p "$cppSrcDir"/liblrdpi "$cppSrcDir"/libstats "$cppSrcDir"/libconf $cppSrcDir/libcommand "$cppSrcDir"/libprocess "$cppSrcDir"/liblua "$cppSrcDir"/libtools "$cppSrcDir"/libfork "$cppSrcDir"/liblicense "$cppSrcDir"/libsyslog
 
 cp "$protoFileDir"/DpiMsgLRproto.proto "$protoFileDir"/DpiMsgLRproto.proto.orig
 cp "$protoFileDir"/Applications.proto "$protoFileDir"/Applications.proto.orig
@@ -78,6 +78,7 @@ cd "$cppSrcDir"
 "$protoc" -I="$protoFileDir" --cpp_out=liblicense  "$protoFileDir"/LicenseReply.proto
 "$protoc" -I="$protoFileDir" --cpp_out=liblicense  "$protoFileDir"/LicenseRequest.proto
 "$protoc" -I="$protoFileDir" --cpp_out=liblicense  "$protoFileDir"/License.proto
+"$protoc" -I="$protoFileDir" --cpp_out=libsyslog  "$protoFileDir"/LogMessage.proto
 mv  liblrdpi/DpiMsgLRproto.pb.cc liblrdpi/DpiMsgLRproto.pb.cpp
 mv  liblrdpi/Applications.pb.cc liblrdpi/Applications.pb.cpp
 mv  libstats/StatsMsg.pb.cc  libstats/StatsMsg.pb.cpp
@@ -104,6 +105,7 @@ mv  libfork/ForkerRequest.pb.cc  libfork/ForkerRequest.pb.cpp
 mv  liblicense/LicenseReply.pb.cc  liblicense/LicenseReply.pb.cpp
 mv  liblicense/LicenseRequest.pb.cc  liblicense/LicenseRequest.pb.cpp
 mv  liblicense/License.pb.cc  liblicense/License.pb.cpp
+mv  libsyslog/LogMessage.pb.cc  libsyslog/LogMessage.pb.cpp
 cd "$startDir"
 
 mkdir -p "$phpSrcDir"