From 6aa4d7cb7d928d720a2d737458f24c9bbb2ededd Mon Sep 17 00:00:00 2001 From: Starow Date: Tue, 12 Aug 2014 15:42:16 +0200 Subject: [PATCH] Harmonising logs messages + Changing some dygraph options --- bin/ZMQ_PubSub_Categ.py | 2 +- bin/ZMQ_Sub_CreditCards.py | 4 ++-- bin/ZMQ_Sub_Duplicate.py | 1 + bin/ZMQ_Sub_Mails.py | 4 ++-- bin/ZMQ_Sub_Onion.py | 2 +- bin/ZMQ_Sub_Urls.py | 2 +- var/www/static/js/indexjavascript.js | 7 +++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bin/ZMQ_PubSub_Categ.py b/bin/ZMQ_PubSub_Categ.py index f41daf14..d5189423 100755 --- a/bin/ZMQ_PubSub_Categ.py +++ b/bin/ZMQ_PubSub_Categ.py @@ -120,7 +120,7 @@ def main(): Pub.send_message(msg) #dico_categ.add(categ) - publisher.info('{0};{1};{2};{3};{4}'.format("Categ", PST.p_source, PST.p_date, PST.p_name,"Detected "+score+" "+word)) + publisher.info('{0};{1};{2};{3};{4}'.format("Categ", PST.p_source, PST.p_date, PST.p_name,"Detected "+score+" "+"\""+word+"\"")) else: if r_serv.sismember("SHUTDOWN_FLAGS", "Categ"): diff --git a/bin/ZMQ_Sub_CreditCards.py b/bin/ZMQ_Sub_CreditCards.py index 3fc57926..f2790392 100755 --- a/bin/ZMQ_Sub_CreditCards.py +++ b/bin/ZMQ_Sub_CreditCards.py @@ -69,9 +69,9 @@ def main(): pprint.pprint(Creditcard_set) if (len(Creditcard_set) > 0): - publisher.warning('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name, str(len(Creditcard_set))+" Valid number(s)" )) + publisher.critical('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name,"Checked " + str(len(Creditcard_set))+" valid number(s)" )) else: - publisher.info('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name, "CreditCard Related" )) + publisher.info('{0};{1};{2};{3};{4}'.format("CreditCard", PST.p_source, PST.p_date, PST.p_name, "CreditCard related" )) prec_filename = filename diff --git a/bin/ZMQ_Sub_Duplicate.py b/bin/ZMQ_Sub_Duplicate.py index e7a7ea5a..873c2b1d 100755 --- a/bin/ZMQ_Sub_Duplicate.py +++ b/bin/ZMQ_Sub_Duplicate.py @@ -183,6 +183,7 @@ def main(): if dupl != []: PST.__setattr__("p_duplicate", dupl) PST.save_attribute_redis(r_serv_merge, "p_duplicate", dupl) + publisher.info('{0};{1};{2};{3};{4}'.format("Duplicate", PST.p_source, PST.p_date, PST.p_name,"Detected " + str(len(dupl))) y = time.time() diff --git a/bin/ZMQ_Sub_Mails.py b/bin/ZMQ_Sub_Mails.py index f8d73ac4..464413c4 100755 --- a/bin/ZMQ_Sub_Mails.py +++ b/bin/ZMQ_Sub_Mails.py @@ -63,9 +63,9 @@ def main(): pprint.pprint(MX_values) if MX_values[0] > 10: - publisher.warning('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name, str(MX_values[0])+ " e-mails detected" )) + publisher.warning('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name,"Checked "+ str(MX_values[0])+ " e-mails" )) else: - publisher.info('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name, str(MX_values[0])+ " e-mails detected" )) + publisher.info('{0};{1};{2};{3};{4}'.format("Mails", PST.p_source, PST.p_date, PST.p_name,"Checked " str(MX_values[0])+ " e-mail(s)" )) prec_filename = filename else: diff --git a/bin/ZMQ_Sub_Onion.py b/bin/ZMQ_Sub_Onion.py index 1e71a9f0..67366bae 100755 --- a/bin/ZMQ_Sub_Onion.py +++ b/bin/ZMQ_Sub_Onion.py @@ -92,7 +92,7 @@ def main(): pprint.pprint(domains_list) print PST.p_path if len(domains_list) > 0: - publisher.warning('{0};{1};{2};{3};{4}'.format("Onion", PST.p_source, PST.p_date, PST.p_name, str(len(domains_list))+" .onions detected" )) + publisher.warning('{0};{1};{2};{3};{4}'.format("Onion", PST.p_source, PST.p_date, PST.p_name,"Detected " + str(len(domains_list))+" .onion(s)" )) else: publisher.info('{0};{1};{2};{3};{4}'.format("Onion", PST.p_source, PST.p_date, PST.p_name, "Onion related" )) diff --git a/bin/ZMQ_Sub_Urls.py b/bin/ZMQ_Sub_Urls.py index 8c731ce5..b5706ed8 100755 --- a/bin/ZMQ_Sub_Urls.py +++ b/bin/ZMQ_Sub_Urls.py @@ -85,7 +85,7 @@ def main(): PST.save_attribute_redis(r_serv1, channel, (A_values[0],list(A_values[1]))) pprint.pprint(A_values) - publisher.info('{0};{1};{2};{3};{4}'.format("Url", PST.p_source, PST.p_date, PST.p_name, str(A_values[0])+" Valid url detected" )) + publisher.info('{0};{1};{2};{3};{4}'.format("Url", PST.p_source, PST.p_date, PST.p_name, "Checked "+str(A_values[0])+" URL" )) prec_filename = filename else: diff --git a/var/www/static/js/indexjavascript.js b/var/www/static/js/indexjavascript.js index aff60b5a..bcf850d1 100644 --- a/var/www/static/js/indexjavascript.js +++ b/var/www/static/js/indexjavascript.js @@ -153,11 +153,10 @@ $(document).ready(function () { rollPeriod: 10, labelsKMB: true, logscale: true, - drawGapEdgePoints: true, - legend: "always", - connectSeparatedPoints: true, + //drawGapEdgePoints: true, + //legend: "always", + //connectSeparatedPoints: true, fillGraph: true, - stackedGraph: true, includeZero: true, });