- all logging configurations in a config/logger.yaml file.

- new 'alert' type of question. - commandline 'debug' argument partially working (still lacks loglevel setup). - information type questions use 'title' instead of hardcoded "Atenção".

- all logging configurations in a config/logger.yaml file.
- new 'alert' type of question. - commandline 'debug' argument partially working (still lacks loglevel setup). - information type questions use 'title' instead of hardcoded "Atenção".
Miguel Barão
1 parent 4feaaba5
Showing 7 changed files with 45 additions and 75 deletions Show diff stats
BUGS.md
app.py
config/server.conf
questions.py
serve.py
templates/test.html
test.py
 # BUGS
-- alunos online têm acesso a /correct e servidor rebenta. (não é fácil impedir...)
-- configuracao dos logs cherrypy para se darem bem com os outros
-- browser e ip usados gravado no test.
+- argumentos da linha de comando a funcionar.
 - usar thread.Lock para aceder a variaveis de estado.
 - permitir adicionar imagens nas perguntas.
-- argumentos da linha de comando a funcionar.
 # TODO
 - implementar practice mode.
-- botões allow all/deny all.
 - enviar logs para web?
 - SQLAlchemy em vez da classe database.
+- single page web no teste/correcçao. Página construída em javascript, obter perguntas com ajax (para practice?).
 - aviso na pagina principal para quem usa browser da treta
 - permitir varios testes, aluno escolhe qual o teste que quer fazer.
 - criar perguntas de outros tipos, e.g. associação, ordenação, varios textinput
 - perguntas para professor corrigir mais tarde.
-- single page web no teste/correcçao. Página construída em javascript, obter perguntas com ajax (para practice?).
 - visualizar um teste ja realizado na página de administração
-- Menu para professor com link para /results e /students
 - fazer uma calculadora javascript e por no menu. surge como modal
 - GeoIP?
-- mostrar botão de reset apenas no final da pagina, com edit para escrever o número.
+- alunos online têm acesso a /correct e servidor rebenta. (não é fácil impedir...)
 # FIXED
+- configuracao dos logs cherrypy para se darem bem com os outros
+- browser e ip usados gravado no test.
+- botões allow all/deny all.
+- mostrar botão de reset apenas no final da pagina, com edit para escrever o número.
 - aluno faz login, mas fecha browser, ficando no estado (online,deny). Ao tentar login com outro browser está deny e o prof não consegue pô-lo em allow pois já não está na lista. => solucao é manter todos os alunos numa tabela.
 - pagina de login nao esta a apresentar bem. parece que precisa de autorizacao para aceder a /static...
 - Não mostrar Professor nos activos em /admin
@@ -3,12 +3,14 @@
 import logging
 from os import path
 import sqlite3
-
 import bcrypt
 import test
 import database
+logger = logging.getLogger(__name__)
+
+
 # ============================================================================
 #   Application
 # ============================================================================
@@ -23,7 +25,7 @@ class App(object):
         # }
         logger.info('============= Running perguntations =============')
         self.online = dict()               # {uid: {'student':{}}}
-        self.allowed = set([])  # '0' is hardcoded to allowed elsewhere FIXME
+        self.allowed = set([])  # '0' is hardcoded to allowed elsewhere
         self.testfactory = test.TestFactory(filename, conf=conf)
         self.db = database.Database(self.testfactory['database']) # FIXME
         try:
@@ -186,12 +188,3 @@ class App(object):
     def set_user_ip(self, uid, ipaddress=''):
         self.online[uid]['student']['ip_address'] = ipaddress
-
-# ============================================================================
-ch = logging.StreamHandler()
-ch.setLevel(logging.INFO)
-ch.setFormatter(logging.Formatter('%(asctime)s | %(name)-10s | %(levelname)-8s | %(message)s'))
-
-logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-logger.addHandler(ch)
@@ -19,11 +19,3 @@ server.socket_port = 8080
 ; not required for snakeoil:
 ; server.ssl_certificate_chain = 'ca_certs.crt'
-
-# add path to the log files here. empty strings disable logging
-; log.error_file = 'logs/errors.log'
-; log.access_file = 'logs/access.log'
-log.error_file = ''
-log.access_file = ''
-log.screen = False
-
@@ -35,18 +35,6 @@ import sys
 # setup logger for this module
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-# fh = logging.FileHandler('question.log')
-ch = logging.StreamHandler()
-ch.setLevel(logging.INFO)
-
-formatter = logging.Formatter('%(asctime)s | %(name)-10s | %(levelname)-8s | %(message)s')
-# fh.setFormatter(formatter)
-ch.setFormatter(formatter)
-
-# logger.addHandler(fh)
-logger.addHandler(ch)
 try:
     import yaml
@@ -168,8 +156,10 @@ class QuestionFactory(dict):
             'text'      : QuestionText,
             'text_regex': QuestionTextRegex,
             'textarea'  : QuestionTextArea,
+            # informative panels
             'information': QuestionInformation,
             'warning'   : QuestionInformation,
+            'alert'     : QuestionInformation,
         }
         # Shallow copy so that script generated questions will not replace
@@ -5,9 +5,10 @@
 from os import path
 import sys
 import argparse
-# import logging
+import logging.config
 import html
 import json
+import yaml
 try:
     import cherrypy
@@ -17,8 +18,6 @@ except ImportError:
     print('Some python packages are missing. See README.md for instructions.')
     sys.exit(1)
-# my code
-from app import App
 # ============================================================================
 #   Authentication
@@ -219,33 +218,32 @@ def parse_arguments():
     argparser = argparse.ArgumentParser(description='Server for online tests. Enrolled students and tests have to be previously configured. Please read the documentation included with this software before running the server.')
     serverconf_file = path.normpath(path.join(SERVER_PATH, 'config', 'server.conf'))
     argparser.add_argument('--conf', default=serverconf_file, type=str, help='server configuration file')
-    # argparser.add_argument('--debug', action='store_true',
-    #     help='Show datastructures when rendering questions')
-    # argparser.add_argument('--show_ref', action='store_true',
-    #     help='Show filename and ref field for each question')
-    # argparser.add_argument('--show_points', action='store_true',
-    #     help='Show normalized points for each question')
-    # argparser.add_argument('--show_hints', action='store_true',
-    #     help='Show hints in questions, if available')
-    # argparser.add_argument('--save_answers', action='store_true',
-    #     help='Saves answers in JSON format')
-    # argparser.add_argument('--practice', action='store_true',
-    #     help='Show correction results and allow repetitive resubmission of the test')
+    argparser.add_argument('--debug', action='store_true',
+        help='Show datastructures when rendering questions')
     argparser.add_argument('testfile', type=str, nargs='+', help='test/exam in YAML format.') # FIXME only one exam supported at the moment
     return argparser.parse_args()
 # ============================================================================
 if __name__ == '__main__':
-
-    # --- path where this file is located
     SERVER_PATH = path.dirname(path.realpath(__file__))
     TEMPLATES_DIR = path.join(SERVER_PATH, 'templates')
+    LOGGER_CONF = path.join(SERVER_PATH, 'config/logger.yaml')
     SESSION_KEY = 'userid'
     # --- parse command line arguments and build base test
     arg = parse_arguments()
+    if arg.debug:
+        LOGGER_CONF = path.join(SERVER_PATH, 'config/logger-debug.yaml')
+
+    # --- Setup logging
+    with open(LOGGER_CONF,'r') as f:
+        logging.config.dictConfig(yaml.load(f))
+
+    # --- start application
+    from app import App
+
     # FIXME do not send args that were not defined in the commandline
     # this means options should be like --show-ref=true|false
     # and have no default value
@@ -292,14 +290,11 @@ if __name__ == &#39;__main__&#39;:
         },
     }
-    # --- app specific configuration
+    cherrypy.engine.unsubscribe('graceful', cherrypy.log.reopen_files) # FIXME what's this?
+    # --- Start server
     cherrypy.tree.mount(webapp, script_name='/', config=conf)
-    # logger.info('Webserver listening at {}:{}'.format(
-    #     cherrypy.config['server.socket_host'],
-    #     cherrypy.config['server.socket_port']))
-
     if hasattr(cherrypy.engine, "signal_handler"):
         cherrypy.engine.signal_handler.subscribe()
     if hasattr(cherrypy.engine, "console_control_handler"):
@@ -309,4 +304,3 @@ if __name__ == &#39;__main__&#39;:
     cherrypy.engine.block()
     # ...App running...
     app.exit()
-    cherrypy.log('Terminated OK ------------------------', 'APPLICATION')
@@ -124,19 +124,27 @@
             % for i,q in enumerate(t['questions']):
                 <div class="ui-corner-all custom-corners">
                     % if q['type'] == 'information':
-                        <div class="alert alert-warning drop-shadow" role="alert">
+                        <div class="alert alert-info drop-shadow" role="alert">
                             <h4>
-                                <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-                                ${q['title']}
+                                <span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> ${q['title']}
                             </h4>
                             <p>
                                 ${pretty(q['text'])}
                             </p>
                         </div>
                     % elif q['type'] == 'warning':
+                        <div class="alert alert-warning drop-shadow" role="alert">
+                            <h4>
+                                <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> ${q['title']}
+                            </h4>
+                            <p>
+                                ${pretty(q['text'])}
+                            </p>
+                        </div>
+                    % elif q['type'] == 'alert':
                         <div class="alert alert-danger drop-shadow" role="alert">
                             <h4>
-                                <span class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></span> Atenção
+                                <span class="glyphicon glyphicon-alert" aria-hidden="true"></span> ${q['title']}
                             </h4>
                             <p>
                                 ${pretty(q['text'])}
@@ -255,9 +263,9 @@
                             <div class="panel-footer">
                             % if t['debug']:
-                                <pre>
+                                <pre><code>
                                     ${yaml.dump(q)}
-                                </pre>
+                                </code></pre>
                             % endif
                             % if t['show_ref']:
@@ -8,12 +8,6 @@ import logging
 # Logger configuration
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
-
-ch = logging.StreamHandler()
-ch.setLevel(logging.INFO)
-ch.setFormatter(logging.Formatter('%(asctime)s | %(name)-10s | %(levelname)-8s | %(message)s'))
-logger.addHandler(ch)
 try:
     import yaml
@@ -188,7 +182,7 @@ class TestFactory(dict):
             q = self.question_factory.generate(random.choice(qq['ref']))
             # some defaults
-            if q['type'] in ('information', 'warning'):
+            if q['type'] in ('information', 'warning', 'alert'):
                 q['points'] = qq.get('points', 0.0)
             else:
                 q['title'] = '{}. '.format(n) + q['title']
	@@ -19,11 +19,3 @@ server.socket_port = 8080		@@ -19,11 +19,3 @@ server.socket_port = 8080
19		19
20	; not required for snakeoil:	20	; not required for snakeoil:
21	; server.ssl_certificate_chain = 'ca_certs.crt'	21	; server.ssl_certificate_chain = 'ca_certs.crt'
22	-
23	-# add path to the log files here. empty strings disable logging
24	-; log.error_file = 'logs/errors.log'
25	-; log.access_file = 'logs/access.log'
26	-log.error_file = ''
27	-log.access_file = ''
28	-log.screen = False
29	-