chg: [hiddenServices] crawlers status, dynamic update

var/www/modules/hiddenServices/Flask_hiddenServices.py

@@ -114,7 +114,7 @@ def hiddenServices_page():
             status=True
         else:
             status=False
-        crawler_metadata.append({'crawler_info': crawler, 'crawling_domain': crawling_domain, 'status_info': status_info, 'status': status})
+        crawler_metadata.append({'crawler_info': crawler_info, 'crawling_domain': crawling_domain, 'status_info': status_info, 'status': status})
 
     date_string = '{}-{}-{}'.format(date[0:4], date[4:6], date[6:8])
     return render_template("hiddenServices.html", last_onions=list_onion, statDomains=statDomains,
@@ -148,9 +148,22 @@ def last_crawled_domains_with_stats_json():
             metadata_onion['status_icon'] = 'fa-times-circle'
         list_onion.append(metadata_onion)
 
+    crawler_metadata=[]
+    all_onion_crawler = r_cache.smembers('all_crawler:onion')
+    for crawler in all_onion_crawler:
+        crawling_domain = r_cache.hget('metadata_crawler:{}'.format(crawler), 'crawling_domain')
+        started_time = r_cache.hget('metadata_crawler:{}'.format(crawler), 'started_time')
+        status_info = r_cache.hget('metadata_crawler:{}'.format(crawler), 'status')
+        crawler_info = '{}  - {}'.format(crawler, started_time)
+        if status_info=='Waiting' or status_info=='Crawling':
+            status=True
+        else:
+            status=False
+        crawler_metadata.append({'crawler_info': crawler_info, 'crawling_domain': crawling_domain, 'status_info': status_info, 'status': status})
+
     date_string = '{}-{}-{}'.format(date[0:4], date[4:6], date[6:8])
 
-    return jsonify({'last_onions': list_onion, 'statDomains': statDomains})
+    return jsonify({'last_onions': list_onion, 'statDomains': statDomains, 'crawler_metadata':crawler_metadata})
 
 @hiddenServices.route("/hiddenServices/get_onions_by_daterange", methods=['POST'])
 def get_onions_by_daterange():

var/www/modules/hiddenServices/templates/hiddenServices.html

@@ -203,14 +203,12 @@
               </table>
             </div>
 
-						{%if crawler_metadata%}
+						<div class="panel panel-info" {%if not crawler_metadata%}hidden{%endif%} id="panel_crawler">
-							<div class="panel panel-info">
 	      			<div class="panel-heading">
 	               Crawlers Status
 	      			</div>
-
 	              <table class="table table-hover table-striped">
-	                <tbody>
+                <tbody id="tbody_crawler_info">
 									{% for crawler in crawler_metadata %}
 	                  <tr>
 		                   <td>
@@ -227,7 +225,6 @@
                 </tbody>
               </table>
             </div>
-						{%endif%}
 
 					</div>
 
@@ -408,6 +405,37 @@ function refresh_list_crawled(){
 			document.getElementById('text_domain_down').innerHTML = statDomains['domains_down']
 			document.getElementById('text_domain_queue').innerHTML = statDomains['domains_queue']
 			document.getElementById('text_total_domains').innerHTML = statDomains['total']
+
+			if(data.crawler_metadata.length!=0){
+				$("#tbody_crawler_info").empty();
+				var tableRef = document.getElementById('tbody_crawler_info');
+				for (var i = 0; i < data.crawler_metadata.length; i++) {
+						var crawler = data.crawler_metadata[i];
+						var newRow = tableRef.insertRow(tableRef.rows.length);
+						var text_color;
+						var icon;
+						if(crawler['status']){
+							text_color = 'Green';
+							icon = 'check';
+						} else {
+							text_color = 'Red';
+							icon = 'times';
+						}
+
+				    var newCell  = newRow.insertCell(0);
+						newCell.innerHTML = "<td><i class=\"fa fa-"+icon+"-circle fa-2x\" style=\"color:"+text_color+";\"></i>"+crawler['crawler_info']+"</td>";
+
+						newCell  = newRow.insertCell(1);
+						newCell.innerHTML = "<td>"+crawler['crawling_domain']+"</td>";
+
+						newCell  = newRow.insertCell(2);
+						newCell.innerHTML = "<td><div style=\"color:"+text_color+";\">"+crawler['status_info']+"</div></td>";
+
+						$("#panel_crawler").show();
+				}
+			} else {
+				$("#panel_crawler").hide();
+			}
 		}
 	);