diff --git a/bin/db_gentest.py b/bin/db_gentest.py index 8e648f6..caf7d9f 100755 --- a/bin/db_gentest.py +++ b/bin/db_gentest.py @@ -16,7 +16,7 @@ GRADE_FILENAME = 'NOTA' if __name__ == "__main__": - root = misc.VmcheckerPaths().dir_checked() + root = misc.VmcheckerPaths().dir_checked if not os.path.exists(root): print " %s directory does not exist " % root diff --git a/bin/initialise_course.py b/bin/initialise_course.py index 00acc63..cce5717 100755 --- a/bin/initialise_course.py +++ b/bin/initialise_course.py @@ -9,17 +9,21 @@ import sqlite3 import misc import sys +import logging +logging.basicConfig(level=logging.DEBUG) +logger = logging.getLogger("vmchecker.initialise_course") +logger.setLevel(logging.DEBUG) +#logger.basicConfig(level=logger.DEBUG) def create_storer_paths(): """ Create all paths used by vmchecker on the storer machine""" - storer_paths = misc.VmcheckerPaths().storer_paths() + storer_paths = misc.VmcheckerPaths().storer_paths for path in storer_paths: if not(os.path.isdir(path)): os.mkdir(path) else: - print("[%s] Skipping existing directory %s" % ( - sys.argv[0], path)) + logger.info("Skipping existing directory %s" % path) @@ -47,12 +51,11 @@ def create_db_tables(db_path): def create_db(): # check for DB existance - db_file = misc.VmcheckerPaths().db_file() + db_file = misc.VmcheckerPaths().db_file if None == db_file: create_db(db_file) else: - print("[%s] Skipping existing Sqlite3 DB file %s" % ( - sys.argv[0], db_file)) + logger.info("Skipping existing Sqlite3 DB file %s" % db_file) @@ -60,8 +63,7 @@ def create_db(): def main(): create_storer_paths() create_db() - print("[%s] storer init done setting up paths and db file." % ( - sys.argv[0])) + logger.info(" -- storer init done setting up paths and db file.") if __name__ == '__main__': main() diff --git a/bin/misc.py b/bin/misc.py index 932bd87..2fdede2 100644 --- a/bin/misc.py +++ b/bin/misc.py @@ -32,7 +32,7 @@ def config(): def relative_path(*args): """Joins the arguments and returns a path relative to root""" - return os.path.join(VmcheckerPaths().root(), os.path.join(*args)) + return os.path.join(VmcheckerPaths().root, os.path.join(*args)) def repository(assignment): @@ -61,7 +61,7 @@ def db_file(): @return - absolute path of config file - None if the path isn't a file""" - path = VmcheckerPaths().db_file() + path = VmcheckerPaths().db_file if os.path.isfile(path): return path else: @@ -74,7 +74,7 @@ def __init__(self): pass def abs_path(self, relative): - return os.path.join(self.root(), relative) + return os.path.join(self.root, relative) @property def root(self): @@ -85,13 +85,13 @@ def root(self): @property def tester_paths(self): """ A list of all the paths relevant to the tester machine.""" - return [self.dir_queue()] + return [self.dir_queue] @property def storer_paths(self): """ A list of all the paths relevant to the storer machine.""" - return [self.dir_unchecked(), self.dir_checked(), - self.dir_backup(), self.dir_tests()] + return [self.dir_unchecked, self.dir_checked, + self.dir_backup, self.dir_tests] @property def dir_unchecked(self): diff --git a/bin/submit.py b/bin/submit.py index 30d4a95..9d0ac80 100755 --- a/bin/submit.py +++ b/bin/submit.py @@ -109,7 +109,7 @@ def submit_assignment(assignment_config): fd = mkstemp( suffix='.zip', prefix='%s_%s_%s_' % (course, assignment, user), - dir=VmcheckerPaths().dir_unchecked()) + dir=VmcheckerPaths().dir_unchecked) print sys.stderr, 'Creating zip package at `%s\'' % fd[1] # adds the files to diff --git a/bin/update_db.py b/bin/update_db.py index 0a4f66e..ebdd7dd 100644 --- a/bin/update_db.py +++ b/bin/update_db.py @@ -11,10 +11,10 @@ GRADE_VALUE_FILE = 'nota' -vmchk_root = misc.VmcheckerPaths().root() -db_path = misc.VmcheckerPaths().db_file() +vmchk_root = misc.VmcheckerPaths().root +db_path = misc.VmcheckerPaths().db_file cwd = os.getcwd() -checked_root = misc.VmcheckerPaths().dir_checked() +checked_root = misc.VmcheckerPaths().dir_checked if not cwd.startswith(checked_root): print "Error: working directory not in the VMCHECKER_ROOT subtree "