From a504a24b123db5fcbc0102be13c489a740b50c60 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy@sandywalsh.com>
Date: Fri, 5 Sep 2014 20:56:15 +0000
Subject: [PATCH] cleaned up some terminology

---
 oahu_config.py | 16 ++++++++--------
 screenrc       | 19 ++++++++++---------
 shoebox.conf   |  2 +-
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/oahu_config.py b/oahu_config.py
index d63a860..9ea4fc8 100644
--- a/oahu_config.py
+++ b/oahu_config.py
@@ -49,8 +49,8 @@ class RequestIdCallback(pipeline_callback.PipelineCallback):
 
     def commit(self, stream, scratchpad):
         print "Req: %s %s time delta = %s" % (scratchpad['request_id'],
-                                                 scratchpad['operation'],
-                                                 scratchpad['delta'])
+                                              scratchpad['operation'],
+                                              scratchpad['delta'])
 
 
 class EodExistsCallback(pipeline_callback.PipelineCallback):
@@ -74,9 +74,9 @@ class Config(oahu.config.Config):
         # Trigger names have to be consistent across all workers
         # (yagi and daemons).
         by_request = trigger_definition.TriggerDefinition("request-id",
-                              ["_context_request_id", ],
-                              criteria.Inactive(60),
-                              [self.request_id_callback,],
+                              ["_context_request_id", ],  # Match criteria
+                              criteria.Inactive(60),  # Trigger criteria
+                              [self.request_id_callback,],  # Pipeline processing
                               debug=True)
 
         # This trigger requires a Trait called "when_date" which is
@@ -98,11 +98,11 @@ class Config(oahu.config.Config):
     def get_distiller_config(self):
         return ""
 
-    def get_ready_chunk_size(self):
+    def get_ready_chunk_size(self):  # Check for Ready streams.
         return 100
 
-    def get_expiry_chunk_size(self):
+    def get_trigger_chunk_size(self):  # Find streams ready to Trigger.
         return 1000
 
-    def get_completed_chunk_size(self):
+    def get_completed_chunk_size(self):  # Cleanup completed streams.
         return -1
diff --git a/screenrc b/screenrc
index 9870651..e67621c 100644
--- a/screenrc
+++ b/screenrc
@@ -1,21 +1,22 @@
 sessionname tach
 hardstatus alwayslastline '%{= .} %-Lw%{= .}%> %n%f %t*%{= .}%+Lw%< %-=%{g}(%{d}%H/%l%{g})'
-screen -t gen bash 
-stuff "cd git/notigen/bin; python event_pump.py ../templates 2 0\r"
+screen -t quincy bash
+stuff "cd git/quincy/quincy; gunicorn --log-file=- 'api:get_api(config_location=\"../../../quincy.conf\")'\r"
+#stuff "cd git/quincy/quincy; gunicorn --log-file=- 'api:get_api()'\r"
+screen -t bash bash
+stuff "klugman streams\r"
 screen -t yagi1 bash
 stuff "cd git/yagi/bin; ./yagi-event --config ../../../shoebox.conf\r"
 screen -t yagi2 bash
 stuff "cd git/yagi/bin; ./yagi-event --config ../../../shoebox.conf\r"
-screen -t quincy bash
-stuff "cd git/quincy/quincy; gunicorn --log-file=- 'api:get_api(config_location=\"../../../quincy.conf\")'\r"
-stuff "cd git/quincy/quincy; gunicorn --log-file=- 'api:get_api()'\r"
-screen -t expired bash
-stuff "pipeline expired \".|oahu_config:Config\" --polling_rate=20\r"
+screen -t trigger bash
+stuff "pipeline trigger \".|oahu_config:Config\" --polling_rate=20\r"
 screen -t ready1 bash
 stuff "pipeline ready \".|oahu_config:Config\" --polling_rate=20\r"
 screen -t ready2 bash
 stuff "pipeline ready \".|oahu_config:Config\" --polling_rate=20\r"
 screen -t completed bash
 stuff "pipeline completed \".|oahu_config:Config\" --polling_rate=20\r"
-screen -t bash bash
-stuff "klugman streams\r"
+screen -t gen bash 
+stuff "cd git/notigen/bin; python event_pump.py ../templates 2 0\r"
+
diff --git a/shoebox.conf b/shoebox.conf
index 0a18b0e..026e22d 100644
--- a/shoebox.conf
+++ b/shoebox.conf
@@ -1,5 +1,5 @@
 [global]
-verbose = True
+verbose = False
 debug = True
 update_timer = 10