From 0cac3146f1b7874bb60c275d21f47cb96155c911 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Tue, 17 Jul 2018 15:11:25 +0200 Subject: [PATCH] fix: remove hardcoded mail url --- bin/Curve.py | 5 ++++- bin/RegexForTermsFrequency.py | 5 ++++- bin/SetForTermsFrequency.py | 5 ++++- bin/packages/config.cfg.sample | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/bin/Curve.py b/bin/Curve.py index ede3ad29..8e228039 100755 --- a/bin/Curve.py +++ b/bin/Curve.py @@ -49,7 +49,7 @@ top_termFreq_setName_month = ["TopTermFreq_set_month", 31] top_termFreq_set_array = [top_termFreq_setName_day,top_termFreq_setName_week, top_termFreq_setName_month] # create direct link in mail -full_paste_url = "http://localhost:7000/showsavedpaste/?paste=" +full_paste_url = "/showsavedpaste/?paste=" def check_if_tracked_term(term, path): if term in server_term.smembers(TrackedTermsSet_Name): @@ -104,6 +104,9 @@ if __name__ == "__main__": # FUNCTIONS # publisher.info("Script Curve started") + # create direct link in mail + full_paste_url = p.config.get("Notifications", "ail_domain") + full_paste_url + # FILE CURVE SECTION # csv_path = os.path.join(os.environ['AIL_HOME'], p.config.get("Directories", "wordtrending_csv")) diff --git a/bin/RegexForTermsFrequency.py b/bin/RegexForTermsFrequency.py index 0300c042..ecca8e4d 100755 --- a/bin/RegexForTermsFrequency.py +++ b/bin/RegexForTermsFrequency.py @@ -36,7 +36,7 @@ top_termFreq_setName_month = ["TopTermFreq_set_month", 31] top_termFreq_set_array = [top_termFreq_setName_day,top_termFreq_setName_week, top_termFreq_setName_month] # create direct link in mail -full_paste_url = "http://localhost:7000/showsavedpaste/?paste=" +full_paste_url = "/showsavedpaste/?paste=" def refresh_dicos(): dico_regex = {} @@ -64,6 +64,9 @@ if __name__ == "__main__": # FUNCTIONS # publisher.info("RegexForTermsFrequency script started") + # create direct link in mail + full_paste_url = p.config.get("Notifications", "ail_domain") + full_paste_url + #compile the regex dico_refresh_cooldown = time.time() dico_regex, dico_regexname_to_redis = refresh_dicos() diff --git a/bin/SetForTermsFrequency.py b/bin/SetForTermsFrequency.py index 4386c535..78de9b08 100755 --- a/bin/SetForTermsFrequency.py +++ b/bin/SetForTermsFrequency.py @@ -35,7 +35,7 @@ top_termFreq_setName_month = ["TopTermFreq_set_month", 31] top_termFreq_set_array = [top_termFreq_setName_day,top_termFreq_setName_week, top_termFreq_setName_month] # create direct link in mail -full_paste_url = "http://localhost:7000/showsavedpaste/?paste=" +full_paste_url = "/showsavedpaste/?paste=" def add_quote_inside_tab(tab): quoted_tab = "[" @@ -63,6 +63,9 @@ if __name__ == "__main__": # FUNCTIONS # publisher.info("RegexForTermsFrequency script started") + # create direct link in mail + full_paste_url = p.config.get("Notifications", "ail_domain") + full_paste_url + #get the dico and matching percent dico_percent = {} dico_set_tab = {} diff --git a/bin/packages/config.cfg.sample b/bin/packages/config.cfg.sample index ae015d8e..9a22e407 100644 --- a/bin/packages/config.cfg.sample +++ b/bin/packages/config.cfg.sample @@ -21,6 +21,7 @@ sentiment_lexicon_file = sentiment/vader_lexicon.zip/vader_lexicon/vader_lexicon ##### Notifications ###### [Notifications] +ail_domain = http://localhost:7000 sender = sender@example.com sender_host = smtp.example.com sender_port = 1337