- removed commented code

Miguel Barão
1 parent db04e658
Showing 2 changed files with 15 additions and 24 deletions Show diff stats
knowledge.py
serve.py
@@ -62,7 +62,6 @@ class Knowledge(object):
     # ------------------------------------------------------------------------
     def get_knowledge_state(self):
-        # logger.debug('-> Knowledge.get_knowledge_state()')
         ts = []
         for t in self.topic_sequence:
             if t in self.state:
@@ -73,7 +72,6 @@ class Knowledge(object):
     # ------------------------------------------------------------------------
     def get_topic_progress(self):
-        # logger.debug('-> Knowledge.get_topic_progress()')
         return len(self.finished_questions) / (len(self.finished_questions) + len(self.questions))
     # ------------------------------------------------------------------------
@@ -33,7 +33,7 @@ from tools import load_yaml, md
 # WebApplication - Tornado Web Server
 # ============================================================================
 class WebApplication(tornado.web.Application):
-    def __init__(self, learnapp):
+    def __init__(self, learnapp, debug=False):
         handlers = [
             (r'/login', LoginHandler),
             (r'/logout', LogoutHandler),
@@ -140,6 +140,7 @@ class FileHandler(BaseHandler):
 # ----------------------------------------------------------------------------
 # respond to AJAX to get a JSON question
+# ----------------------------------------------------------------------------
 class QuestionHandler(BaseHandler):
     templates = {
         'checkbox':     'question-checkbox.html',
@@ -153,13 +154,8 @@ class QuestionHandler(BaseHandler):
         'success':      'question-success.html',
     }
-    # @tornado.web.authenticated
-    # def get(self): # FIXME unused
-    #     self.redirect('/')
-
     @tornado.web.authenticated
     def post(self):
-        # ref = self.get_body_arguments('question_ref')
         user = self.current_user
         answer = self.get_body_arguments('answer')
         next_question = self.learn.check_answer(user, answer)
@@ -201,38 +197,33 @@ def main():
     # --- Commandline argument parsing
     argparser = argparse.ArgumentParser(description='Server for online learning. Enrolled students and topics have to be previously configured. Please read the documentation included with this software before running the server.')
-    # FIXME:
-        # 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='Enable debug logging.')
-        # argparser.add_argument('--allow-all', action='store_true',
-            # help='Students are initially allowed to login (can be denied later)')
-    argparser.add_argument('conffile', type=str, nargs='+', help='Topics configuration file in YAML format.') # FIXME only one supported at the moment
+    argparser.add_argument('conffile', type=str, nargs='+',
+        help='Topics configuration file in YAML format.') # FIXME only one
+    argparser.add_argument('--debug', action='store_true',
+        help='Enable debug logging.')     # FIXME not implemented
     arg = argparser.parse_args()
     # --- Setup logging
     try:
         logging.config.dictConfig(load_yaml(LOGGER_CONF))
-    except: # FIXME  should this be done in a different way?
+    except:
         print('An error ocurred while setting up the logging system.')
-        print('Common causes:\n - inexistent directory "logs"?\n - write permission to "logs" directory?')
         sys.exit(1)
-
     logging.info('===========================================================')
     # --- start application
     learnapp = LearnApp(arg.conffile[0])
     try:
-        webapp = WebApplication(learnapp)
+        webapp = WebApplication(learnapp, debug=argparser.debug)
     except Exception as e:
         logging.critical('Can\'t start application.')
-        # sys.exit(1)
-        raise e  # FIXME
+        raise e
     # --- create webserver
-    http_server = tornado.httpserver.HTTPServer(webapp, ssl_options={
-        "certfile": "certs/cert.pem",
-        "keyfile": "certs/key.pem"
+    http_server = tornado.httpserver.HTTPServer(webapp,
+        ssl_options={
+            "certfile": "certs/cert.pem",
+            "keyfile": "certs/key.pem"
         })
     http_server.listen(8443)
@@ -240,7 +231,9 @@ def main():
     try:
         logging.info('Webserver running...')
         tornado.ioloop.IOLoop.current().start()
+
         # running...
+
     except KeyboardInterrupt:
         tornado.ioloop.IOLoop.current().stop()
         logging.info('Webserver stopped.')