Merge branch 'dev'

Jeremy
2 parents 2ec87e0f 4891bfbd
Showing 20 changed files with 194 additions and 34 deletions Show diff stats
.gitignore
install/REQUIREMENTS.txt
install/REQUIREMENTS_DEV.txt
install/REQUIREMENTS_SQLITE.txt
install/REQUIREMENTS_WINDOWS.txt
logs/Readme.md
pyrosrun.sh
src/dashboard/templates/dashboard/system.html
src/dashboard/views.py
src/logger/__init__.py
src/logger/config.py
src/misc/static/media/arrow_green.png
src/misc/static/media/error.png
src/misc/static/media/validate.jpg
src/pyros/settings.py
src/routine_manager/forms.py
src/routine_manager/tests_routine_simulator.py
src/routine_manager/views.py
src/scheduler/templates/scheduler/current_schedule.html
src/scheduler/views.py
@@ -7,4 +7,5 @@ __pycache__
 src/images/*_*
 src/alert_manager/twistd*
 src/db.sqlite3
-src/common/migrations/0*
 \ No newline at end of file
+src/common/migrations/0*
+logs/*.log
 \ No newline at end of file
@@ -4,7 +4,7 @@ anyjson==0.3.3
 billiard==3.3.0.23
 celery==3.1.23
 DateTime==4.1.1
-Django==1.9.4
+Django==1.10.2
 django-admin-tools==0.7.2
 django-bootstrap3==7.0.1
 django-celery==3.1.17
@@ -4,7 +4,7 @@ billiard==3.3.0.23
 celery==3.1.23
 astroid==1.4.5
 colorama==0.3.7
-Django==1.9.4
+Django==1.10.2
 django-admin-tools==0.7.2
 django-bootstrap3==7.0.1
 django-debug-toolbar==1.4
@@ -4,7 +4,7 @@ anyjson==0.3.3
 billiard==3.3.0.23
 celery==3.1.23
 DateTime==4.1.1
-Django==1.9.4
+Django==1.10.2
 django-admin-tools==0.7.2
 django-bootstrap3==7.0.1
 django-celery==3.1.17
@@ -4,7 +4,7 @@ anyjson==0.3.3
 billiard==3.3.0.23
 celery==3.1.23
 DateTime==4.1.1
-Django==1.9.4
+Django==1.10.2
 django-admin-tools==0.7.2
 django-bootstrap3==7.0.1
 django-celery==3.1.17
@@ -23,4 +23,4 @@ six==1.10.0
 sqlparse==0.1.19
 Twisted==16.0.0
 virtualenv==15.0.1
-zope.interface==4.1.1
 \ No newline at end of file
+zope.interface==4.1.1
@@ -0,0 +1,28 @@
+File Logs are organized by module
+
+every file is reseted at pyros launch except pyros.log
+You must clean this directory before pushing.
+You can use the pyrosrun.sh clear_logs command.
+
+For example, logs for the module MONITORING must be in the file :
+
+>     monitoring.logs
+
+The logs are formated like this :
+
+>     '%(filename)s : %(lineno)s -> %(message)s'
+>     "filename : line -> message".
+
+To use the logger you must import logger.config
+
+>    import logger.config as l
+>    log = l.setupLogger("name", "file_name")
+
+Basic log :
+
+>    log.info('Your message')
+
+if you want to log in the file pyros.log you must use logging
+
+>    import logger.config as l
+>    l.logging.info('Your message')
@@ -10,7 +10,8 @@ COMMANDS=&quot;\n
 \t'simul_on' : Starts the simulators\n
 \t'simul_off' : Stops the simulators\n
 \t'start' : Starts the simulators then the celery workers, then the web server\n
-\t'stop' : Stops the celery workers then the simulators"
+\t'stop' : Stops the celery workers then the simulators\n
+\t'clean_logs' : Clear all pyros .log files from /logs"
  
 NEEDED_COMMAND="One command is needed. Possible commands : $COMMANDS"
 INVALID_COMMAND="Invalid command. Possible commands : $COMMANDS"
@@ -74,6 +75,11 @@ case &quot;$1&quot; in
      ./kill_all.sh
      cd -
 	;;
+     "clean_logs")
+     cd ../logs
+     rm -f *.log
+     cd -
+	;;
      *)
 	echo -e $INVALID_COMMAND
 	;;
@@ -6,24 +6,24 @@
 		background-color: #383838;
 		height: 300px;
 	}
-	
+
 	hr {
 		height: 1px;
 		border-style: solid;
 		border-width: 1px 0 0 0;
 		border-color: white;
 	}
-	
+
 	p, h1, h4, h5, hr {
 		color: white;
 	}
-	
+
 	.fixed {
 		height: 340px;
 		overflow: hidden;
 		background-color: black;
 	}
-	
+
 	li {
 		list-style-type: none;
 	}
@@ -31,17 +31,17 @@
  
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 	<script>
-	
-		function retrieve_logs() { 
-		$('#logs').load("{% url "dashboard.views.system_retrieve_logs" %}" );
-		 
+
+		function retrieve_logs() {
+		$('#logs').load("{% url 'system_retrieve_logs' %}");
+
 		 }
-		
+
 		$(document).ready(function() {
 		retrieve_logs();
 		setInterval(retrieve_logs, 1000);
 		});
-	
+
 	</script>
  
 	{% endblock %}
@@ -3,6 +3,9 @@ from django.core import urlresolvers
 from django.contrib.auth.decorators import login_required
 from common.models import Log
  
+import logger.config as l
+log = l.setupLogger("dashboard", "dashboard");
+
 @login_required
 def users(request):
     url_ = urlresolvers.reverse('admin:auth_user_changelist')
@@ -36,11 +39,10 @@ def devices(request):
 def system(request):
     return render(request, 'dashboard/system.html')
  
-
 @login_required
 def system_retrieve_logs(request):
     '''
-        Called by the dashboard system page with ajax request every 1s, to get the logs and print them
+        Called by the dashboard system page with ajax request every seconds, to get the logs and print them
     '''
     if request.is_ajax():
         alert_logs = Log.objects.filter(agent='Alert manager')
@@ -0,0 +1,25 @@
+from django.conf import settings
+import logging
+import sys
+
+# maybe reset files with a variable from settings for the logging
+# if (settings.RESETLOGS):
+
+
+logging.basicConfig(filename='%s/../logs/pyros.log'%(settings.BASE_DIR), format='-> At : [%(asctime)s]\n\t By module [%(module)s] logger : [%(name)s] : "%(message)s"', level=logging.DEBUG)
+
+if (settings.DEBUG):
+    logging.info('Logger instantiated')
+
+def setupLogger(logger_name, log_file, level=logging.INFO):
+    l = logging.getLogger(logger_name)
+    formatter = logging.Formatter('[%(message)s] at %(filename)s : %(lineno)s')
+    fileHandler = logging.FileHandler('%s/../logs/%s.log'%(settings.BASE_DIR, log_file), mode='w')
+    fileHandler.setFormatter(formatter)
+    # streamHandler = logging.StreamHandler()
+    # streamHandler.setFormatter(formatter)
+
+    l.setLevel(level)
+    l.addHandler(fileHandler)
+    # l.addHandler(streamHandler)
+    return (logging.getLogger(logger_name))
@@ -183,8 +183,12 @@ USE_L10N = True
 USE_TZ = True
  
  
+# To find the media files {{ MEDIA_URL }}
+MEDIA_URL = '/public/static/media/'
+
+
 # To find the static files in the app/static/ap/... folders
-STATIC_URL = '/static/'
+STATIC_URL = '/public/static/'
  
 # To find the static files in src/static/. Any local directory can be added to this list.
 STATICFILES_DIRS = (
+from django.conf import settings
 from django import forms
 from common.models import *
 from routine_manager.validators import check_album_validity
  
+import logging
+log = logging.getLogger("routine_manager-views")
+
 class RequestForm(forms.ModelForm):
     """
         Form for Request edition
@@ -13,6 +17,8 @@ class RequestForm(forms.ModelForm):
  
     def __init__(self, *args, readonly=False, **kwargs):
         super(RequestForm, self).__init__(*args, **kwargs)
+        if (settings.DEBUG):
+            log.info("From __init__ of RequestForm")
         for field in self.fields.values():
             if readonly == True:
                 field.widget.attrs['readonly'] = True
@@ -40,6 +46,8 @@ class SequenceForm(forms.ModelForm):
  
     def __init__(self, *args, readonly=False, **kwargs):
         super(SequenceForm, self).__init__(*args, **kwargs)
+        if (settings.DEBUG):
+            log.info("From __init__ of SequenceForm")
         for field in self.fields.values():
             if readonly == True:
                 field.widget.attrs['readonly'] = True
@@ -55,6 +63,8 @@ class SequenceForm(forms.ModelForm):
  
     def save(self):
         seq = super(SequenceForm, self).save()
+        if (settings.DEBUG):
+            log.info("From save function of SequenceForm")
         if self.cleaned_data["start_expo_pref"] == "IM":
             seq.t_prefered = -1;
         elif self.cleaned_data["start_expo_pref"] == "BE":
@@ -78,6 +88,8 @@ class AlbumForm(forms.ModelForm):
  
     def __init__(self, *args, readonly=False, **kwargs):
         super(AlbumForm, self).__init__(*args, **kwargs)
+        if (settings.DEBUG):
+            log.info("From __init__ of AlbumForm")
         for field in self.fields.values():
             if readonly == True:
                 field.widget.attrs['readonly'] = True
@@ -98,6 +110,8 @@ class PlanForm(forms.ModelForm):
  
     def __init__(self, *args, readonly=False, **kwargs):
         super(PlanForm, self).__init__(*args, **kwargs)
+        if (settings.DEBUG):
+            log.info("From __init__ of PlanForm")
         plan = kwargs["instance"]
  
         self.fields["filter"].queryset = plan.album.detector.filter_wheel.filters
@@ -133,6 +147,8 @@ class PlanForm(forms.ModelForm):
  
     def save(self):
         plan = super(PlanForm, self).save()
+        if (settings.DEBUG):
+            log.info("From save of PlanForm")
         plan.complete = True
         plan.duration = self.cleaned_data["duration"] / 86400
         plan.save()
@@ -0,0 +1,11 @@
+from django.test import TestCase
+from common.models import *
+import os
+
+class SimulatorRoutine(TestCase):
+    def setUp(self):
+        pass
+
+    def test_creation(self):
+        # self.assertEqual(1, 0, "Standard error")
+        pass
@@ -7,6 +7,11 @@ from .validators import check_plan_validity, check_album_validity, check_sequenc
 from .RequestSerializer import RequestSerializer
 import scheduler
  
+""" logger """
+from django.conf import settings
+import logger.config as l
+log = l.setupLogger("routine_manager-views", "routine_manager-views")
+
 """ XML Export / Import utils """
 from wsgiref.util import FileWrapper
 from django.utils.encoding import smart_str
@@ -24,6 +29,9 @@ def requests_list(request, status=0, message=&quot;&quot;):
         Retrieves and display the routines list (routine manager main page)
     """
  
+    if settings.DEBUG:
+        log.info("From requests_list")
+
     if status == "-1":
         error = True
     elif status == "1":
@@ -54,6 +62,9 @@ def action_request(request, req_id, action, status=0, message=&quot;&quot;):
     req = Request.objects.get(id=req_id)
     depth_level = 1
  
+    if settings.DEBUG:
+        log.info("From action_request")
+
     if status == "-1":
         error = True
     elif status == "1":
@@ -91,6 +102,9 @@ def request_validate(request, req_id):
     req = Request.objects.get(id=req_id)
     form = RequestForm(instance=req, data=request.POST)
  
+    if (settings.DEBUG):
+        log.info("From request_validate")
+
     if action == "cancel":
         if req.name == "New request":
             req.delete()
@@ -123,6 +137,9 @@ def action_sequence(request, seq_id, action, status=0, message=&quot;&quot;):
     req_id = req.id
     depth_level = 2
  
+    if (settings.DEBUG):
+        log.info("From action_sequence")
+
     if status == "-1":
         error = True
     elif status == "1":
@@ -158,6 +175,9 @@ def sequence_validate(request, seq_id):
         Possible actions : Cancel, Save, Save and add album, Delete
     """
  
+    if (settings.DEBUG):
+        log.info("From sequence_validate")
+
     seq_id = int(seq_id)
     action = request.POST.get("action")
     seq = Sequence.objects.get(id=seq_id)
@@ -197,6 +217,9 @@ def action_album(request, alb_id, action, status=0, message=&quot;&quot;):
     seq_id = alb.sequence.id
     depth_level = 3
  
+    if (settings.DEBUG):
+        log.info("From action_album")
+
     if status == "-1":
         error = True
     elif status == "1":
@@ -235,6 +258,10 @@ def album_validate(request, alb_id):
     alb = Album.objects.get(id=alb_id)
     form = AlbumForm(instance=alb, data=request.POST)
  
+    if (settings.DEBUG):
+        log.info("From album_validate")
+
+
     if action == "cancel":
         if alb.name == "New album":
             alb.delete()
@@ -272,6 +299,9 @@ def action_plan(request, plan_id, action, status=0, message=&quot;&quot;):
     alb_id = plan.album.id
     depth_level = 4
  
+    if (settings.DEBUG):
+        log.info("From action_plan")
+
     if status == "-1":
         error = True
     elif status == "1":
@@ -310,6 +340,10 @@ def plan_validate(request, plan_id):
     plan = Plan.objects.get(id=plan_id)
     form = PlanForm(instance=plan, data=request.POST)
  
+    if (settings.DEBUG):
+        log.info("From plan_validate")
+
+
     if action == "cancel":
         if plan.name == "New plan":
             plan.delete()
@@ -376,6 +410,9 @@ def submit_request(request, req_id, redir):
         Submits a request and its sequences for scheduling
     """
  
+    if (settings.DEBUG):
+        log.info("From submit_request")
+
     req = Request.objects.get(id=req_id)
     error = False
     if req.complete == False:
@@ -409,6 +446,9 @@ def unsubmit_request(request, req_id):
         Unsubmits a request and remove its sequences from scheduling
     """
  
+    if (settings.DEBUG):
+        log.info("From unsubmit_request")
+
     req = Request.objects.get(id=req_id)
  
 # TODO: uncomment pour la production
@@ -438,6 +478,9 @@ def export_request(request, req_id):
         Create an XML file with the given request, and send a download request to the user
     """
  
+    if (settings.DEBUG):
+        log.info("From export_request")
+
     req = Request.objects.get(id=req_id)
     if req.complete == False:
         message = "Request must be completely valid to be serialized"
@@ -463,6 +506,9 @@ def import_request(request):
         Don't do anything if there is a single error into the file
     """
  
+    if (settings.DEBUG):
+        log.info("From import_request")
+
     if request.method == "POST":
         file = request.FILES.get("request_file")
         if file is None:
@@ -25,16 +25,22 @@
  
 			<div class="row">
  
-				<h3>Schedule info</h3>
+				<h2>Schedule info</h2>
+
+			{% if schedule == None %}
+
+			<h3>There is no schedule in the database</h3>
+
+			{% else %}
  
          		<div class="well">
                 	Schedule Night Start: {{schedule.plan_night_start|jdtodate}}
                 </div>
-         		
+
          		<div class="well">
                 	Schedule Start: {{schedule.plan_start|jdtodate}}
                 </div>
-             
+
              	<div class="well">
                     Schedule End: {{schedule.plan_end|jdtodate}}
          		</div>
@@ -53,15 +59,15 @@
  
 			</div>
  
-
 			<div class="row">
 				<h3>List of Sequences - <span class="label label-primary">{{sequences|length}}</span></h3>
-                
+
                 <div class="table-responsive">
                 	<table
                     	class="table table-bordered table-hover table-striped tablesorter">
                         <thead>
                         	<tr>
+															<th>State <i class="fa fa-sort"></i></th>
 	                            <th>ID <i class="fa fa-sort"></i></th>
 	                            <th>Owner <i class="fa fa-sort"></i></th>
 	                            <th>Start <i class="fa fa-sort"></i></th>
@@ -75,8 +81,18 @@
                         </thead>
 						<tbody>
 							<!-- sequence is a tuple (sequence, shs) -->
+							{% load static %}
                             {% for sequence in sequences %}
 	                            <tr>
+																	<td>
+																		{% if sequence.processing == 1 %}
+																		<img src="{% static "media/arrow_green.png" %}" alt="html5" height="30" width="30" style="margin-left:25%"/>
+																		{% elif sequence.processing == 0 and sequence.status == "EXECUTED" %}
+																		<img src="{% static "media/validate.jpg" %}" alt="html5" height="30" width="30" style="margin-left:25%"/>
+																		{% else %}
+																		<img src="{% static "media/error.png" %}" alt="{{sequence.processing}}" height="30" width="30" style="margin-left:25%"/>
+																		{% endif %}
+																	</td>
 	                                <td>{{ sequence.0.id }}</td>
 	                                <td>{{ sequence.0.request.pyros_user.user.username }}</td>
 	                                <td>{{ sequence.1.tsp|jdtodate }}</td>
@@ -92,8 +108,8 @@
                     </table>
                 </div>
  			</div>
+			{% endif %}
  
       	</div><!-- /#page-wrapper -->
  
  	{% endblock %}
-      	
 \ No newline at end of file
@@ -8,13 +8,19 @@ SIMULATION_FILE = &#39;file:./scheduler/sequences_cador.html&#39;
  
 @login_required
 def current_schedule(request):
-    schedule = Schedule.objects.order_by("-created")[0]
-    shs_list = schedule.shs.all()
-    sequences = [(shs.sequence, shs) for shs in shs_list]
-
-    nb_scheduled_sequences = len(shs_list)
-    executed_sequences = len([shs for shs in shs_list if shs.status == Sequence.EXECUTED])
-
+    if (len(Schedule.objects.all()) > 0):                       # checking if the schedule is empty
+        schedule = Schedule.objects.order_by("-created")[0]     # Sorting Schedule
+        shs_list = schedule.shs.all()                           # getting all the schedule has sequences references
+        sequences = [(shs.sequence, shs) for shs in shs_list]   # getting all sequences
+
+        nb_scheduled_sequences = len(shs_list)
+        executed_sequences = len([shs for shs in shs_list if shs.status == Sequence.EXECUTED])
+    else: # if empty set everything to 0 / None (variables are checked in src/templates/scheduler/current_schedule.html)
+        schedule = None
+        sequences = None
+        shs_list = None
+        nb_scheduled_sequences = 0
+        executed_sequences = 0
  
     return render(request, 'scheduler/current_schedule.html', {'sequences' : sequences, 'schedule' : schedule, 'nb_scheduled_sequences' : nb_scheduled_sequences, 'executed_sequences' : executed_sequences})
  
@@ -31,4 +37,3 @@ def schedule_simulation(request):
  
     sequences.sort(key=lambda seq: seq[1].tsp)
     return render(request, 'scheduler/current_schedule.html', {'sequences' : sequences, 'schedule' : schedule, 'nb_scheduled_sequences' : nb_scheduled_sequences, 'executed_sequences' : executed_sequences})
-