From 2d488c483262a64adcdd0cc01b07e7f1394364d7 Mon Sep 17 00:00:00 2001
From: Tom Artale <tom.artale@usmac1456tarta.schq.secious.com>
Date: Tue, 27 Oct 2015 16:36:20 -0600
Subject: [PATCH] Changes based on discussion with Paul

---
 protofiles/configelements/AnubisConfig.proto | 28 +++++++++++---------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/protofiles/configelements/AnubisConfig.proto b/protofiles/configelements/AnubisConfig.proto
index d924cb6c5465d..3fa7d965c8a7e 100644
--- a/protofiles/configelements/AnubisConfig.proto
+++ b/protofiles/configelements/AnubisConfig.proto
@@ -5,23 +5,26 @@ option java_outer_classname = "AnubisConfigMsg";
 
 message AnubisConfig {
    
+   message AccumulatorConf {
+      optional int32 secondsToAccumulate = 1;
+      optional int32 entriesToAccumulate = 2;
+      optional int32 maxBatchSizeBytes = 3;
+   }
+
    message GigawattDBConfig {
-      optional string name = 1;
-      optional uint64 batchLimBytes = 2;
-      optional int32 batchLimRows = 3;
-      optional int32 dbMaxRows = 4;
+      optional string gigawattDbPath = 1;
+      optional int32 dbMaxRows = 2;
    }
 
    message RelayConfig {
       optional string mediatorQueue = 1; 
       optional int32 mediatorQueueSize = 2;
-      optional int32 timeoutAutoSendMs = 3; 
-      optional int32 timeoutReceiveMs = 4;
+      optional int32 timeoutReceiveMs = 3;
    }
 
    message BiffConfig {
-      optional string ackidQueue = 1;
-      optional int32 ackidQueueSize = 2;
+      optional string ackQueue = 1;
+      optional int32 ackQueueSize = 2;
    }
 
    message MessageRetryConfig {
@@ -29,9 +32,10 @@ message AnubisConfig {
       optional int32 ageForOldSecs = 2;
    }
 
-   optional GigawattDBConfig gigawattDBConfig= 1;
-   optional RelayConfig relayConfig = 2;
-   optional BiffConfig biffConfig = 3;
-   optional MessageRetryConfig messageRetryConfig = 4;
+   optional AccumulatorConf accumulatorConf = 1;
+   optional GigawattDBConfig gigawattDBConfig= 2;
+   optional RelayConfig relayConfig = 3;
+   optional BiffConfig biffConfig = 4;
+   optional MessageRetryConfig messageRetryConfig = 5;
 
 }