From 272b0fe960ef869f63aa691dde84034062ad811e Mon Sep 17 00:00:00 2001
From: kovacsbalu <kovacsbalu@gmail.com>
Date: Tue, 9 Oct 2018 09:32:32 +0200
Subject: [PATCH] RegexpForTerm timeout from config Critical log removed

---
 bin/RegexForTermsFrequency.py  | 12 +++++-------
 bin/packages/config.cfg.sample |  3 +++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bin/RegexForTermsFrequency.py b/bin/RegexForTermsFrequency.py
index 627f8db9..26669b48 100755
--- a/bin/RegexForTermsFrequency.py
+++ b/bin/RegexForTermsFrequency.py
@@ -28,10 +28,8 @@ def timeout_handler(signum, frame):
 
 signal.signal(signal.SIGALRM, timeout_handler)
 
-
 # Config Variables
 DICO_REFRESH_TIME = 60  # s
-PROCESS_TIMEOUT = 60
 
 BlackListTermsSet_Name = "BlackListSetTermSet"
 TrackedTermsSet_Name = "TrackedSetTermSet"
@@ -63,6 +61,7 @@ if __name__ == "__main__":
 
     config_section = 'RegexForTermsFrequency'
     p = Process(config_section)
+    max_execution_time = p.config.getint("BankAccount", "max_execution_time")
 
     # REDIS #
     server_term = redis.StrictRedis(
@@ -97,18 +96,17 @@ if __name__ == "__main__":
             timestamp = calendar.timegm((int(temp[-4]), int(temp[-3]), int(temp[-2]), 0, 0, 0))
 
             curr_set = top_termFreq_setName_day[0] + str(timestamp)
-            content = Paste.Paste(filename).get_p_content()
+            paste = Paste.Paste(filename)
+            content = paste.get_p_content()
 
             # iterate the word with the regex
             for regex_str, compiled_regex in dico_regex.items():
 
-                signal.alarm(PROCESS_TIMEOUT)
+                signal.alarm(max_execution_time)
                 try:
                     matched = compiled_regex.search(content)
                 except TimeoutException:
-                    log_msg = "{0} processing timeout".format(filename)
-                    print (log_msg)
-                    publisher.critical(log_msg)
+                    print ("{0} processing timeout".format(paste.p_path))
                     continue
                 else:
                     signal.alarm(0)
diff --git a/bin/packages/config.cfg.sample b/bin/packages/config.cfg.sample
index eead0357..4d196a6b 100644
--- a/bin/packages/config.cfg.sample
+++ b/bin/packages/config.cfg.sample
@@ -96,6 +96,9 @@ operation_mode = 3
 #Define the time that a paste will be considerate duplicate. in seconds (1day = 86400)
 ttl_duplicate = 86400
 
+[RegexForTermsFrequency]
+max_execution_time = 60
+
 ##### Redis #####
 [Redis_Cache]
 host = localhost