From d7545a46f05130117f1897a1819bf3cc2db128fd Mon Sep 17 00:00:00 2001
From: Terrtia <or1994@hotmail.fr>
Date: Thu, 2 Aug 2018 15:29:13 +0200
Subject: [PATCH] chg: [Mixer] add submitted paste

---
 bin/Mixer.py        | 19 +++++++++++++++++++
 bin/submit_paste.py |  3 +++
 2 files changed, 22 insertions(+)

diff --git a/bin/Mixer.py b/bin/Mixer.py
index 98709ea5..96f20815 100755
--- a/bin/Mixer.py
+++ b/bin/Mixer.py
@@ -68,6 +68,12 @@ if __name__ == '__main__':
         db=cfg.getint("Redis_Mixer_Cache", "db"),
         decode_responses=True)
 
+    server_cache = redis.StrictRedis(
+        host=cfg.get("Redis_Log_submit", "host"),
+        port=cfg.getint("Redis_Log_submit", "port"),
+        db=cfg.getint("Redis_Log_submit", "db"),
+        decode_responses=True)
+
     # LOGGING #
     publisher.info("Feed Script started to receive & publish.")
 
@@ -184,7 +190,17 @@ if __name__ == '__main__':
                 publisher.debug("Empty Paste: {0} not processed".format(message))
         else:
             print("Empty Queues: Waiting...")
+
             if int(time.time() - time_1) > refresh_time:
+                # update internal feeder
+                list_feeder = server_cache.hkeys("mixer_cache:list_feeder")
+                if list_feeder:
+                    for feeder in list_feeder:
+                        count = int(server_cache.hget("mixer_cache:list_feeder", feeder))
+                        if count is None:
+                            count = 0
+                        processed_paste_per_feeder[feeder] = processed_paste_per_feeder.get(feeder, 0) + count
+                        processed_paste = processed_paste + count
                 print(processed_paste_per_feeder)
                 to_print = 'Mixer; ; ; ;mixer_all All_feeders Processed {0} paste(s) in {1}sec'.format(processed_paste, refresh_time)
                 print(to_print)
@@ -204,5 +220,8 @@ if __name__ == '__main__':
                     duplicated_paste_per_feeder[feeder] = 0
 
                 time_1 = time.time()
+
+                # delete internal feeder list
+                server_cache.delete("mixer_cache:list_feeder")
             time.sleep(0.5)
             continue
diff --git a/bin/submit_paste.py b/bin/submit_paste.py
index 5f18fd6a..a9b5e903 100755
--- a/bin/submit_paste.py
+++ b/bin/submit_paste.py
@@ -40,6 +40,9 @@ def create_paste(uuid, paste_content, ltags, ltagsgalaxies, name):
     relay_message = "{0} {1}".format(save_path, gzip64encoded)
     p.populate_set_out(relay_message, 'Mixer')
 
+    # increase nb of paste by feeder name
+    r_serv_log_submit.hincrby("mixer_cache:list_feeder", "submitted", 1)
+
     # add tags
     add_tags(ltags, ltagsgalaxies, full_path)