diff --git a/src/bin/app_recommender.cfg b/src/bin/app_recommender.cfg index 8ca035e..dc6f199 100644 --- a/src/bin/app_recommender.cfg +++ b/src/bin/app_recommender.cfg @@ -3,34 +3,34 @@ [general] # logging level debug = 0 -verbose = 0 +verbose = 1 # output file #output = /dev/null -output = log-apprec +output = log-popindex-desktop-full [data_sources] # path to recommender filters filters = ~/.app-recommender/filters # path to apt-xapian-index #axi = /var/lib/apt-xapian-index/index -axi = /root/.app-recommender/DesktopAxi +axi = /root/.app-recommender/axi_desktop # DDE url -dde_url = http://dde.debian.net/dde/q/udd/packages/all/%s?t=json +#dde_url = http://dde.debian.net/dde/q/udd/packages/all/%s?t=json +dde_url = http://46.4.235.200:8000/q/udd/packages/all/%s?t=json # old, reindex, cluster, recluster index_mode = old # path to popcon index -popcon_index = ~/.app-recommender/popcon-index_desktop_1000 +popcon_index = ~/.app-recommender/popcon-index_desktop # path to popcon submissions dir -#popcon_dir = ~/.app-recommender/popcon_dir -popcon_dir = ~/org/popcon.debian.org/popcon-mail/popcon-entries/ +popcon_dir = ~/.app-recommender/popcon-entries # path to valid_pkgs file -pkgs_filter = program +pkgs_filter = desktop # path to popcon clusters dir clusters_dir = ~/.app-recommender/clusters_dir_full # number of medoids for clustering k_medoids = 100 # number of popcon submission for indexing -max_popcon = 1000 +max_popcon = 100000000 [recommender] # recommendation strategy diff --git a/src/config.py b/src/config.py index 459f2e3..6041ab6 100644 --- a/src/config.py +++ b/src/config.py @@ -26,8 +26,9 @@ import logging import logging.handlers from ConfigParser import * +from singleton import Singleton -class Config(): +class Config(Singleton): """ Class to handle configuration options. """ @@ -35,29 +36,33 @@ class Config(): """ Set default configuration options. """ - self.debug = 0 - self.verbose = 1 - self.output = "/dev/null" - self.filters = os.path.expanduser("~/.app-recommender/filters") - #self.axi = "/var/lib/apt-xapian-index/index" - self.axi = os.path.expanduser("~/.app-recommender/ProgramAxi") - #self.dde_url = "http://dde.debian.net/dde/q/udd/packs/all/%s?t=json" - self.dde_url = "http://46.4.235.200:8000/q/udd/packages/all/%s?t=json" - self.popcon_index = os.path.expanduser("~/.app-recommender/popcon-index") - self.popcon_dir = os.path.expanduser("~/.app-recommender/popcon-entries") - self.pkgs_filter = "program" - self.clusters_dir = os.path.expanduser("~/.app-recommender/clusters-dir") - self.k_medoids = 100 - self.max_popcon = 1000 - self.index_mode = "old" - self.strategy = "cb" - self.weight = "bm25" - self.profile_size = 50 - # options: maximal, voted, desktop - self.profiling = ["maximal"] - self.k_neighbors = 100 - self.load_options() - self.set_logger() + if not hasattr(self, 'initialized'): + self.debug = 0 + self.verbose = 1 + #self.output = "/dev/null" + self.output = "log" + self.filters = os.path.expanduser("~/.app-recommender/filters") + #self.axi = "/var/lib/apt-xapian-index/index" + self.axi = os.path.expanduser("~/.app-recommender/ProgramAxi") + #self.dde_url = "http://dde.debian.net/dde/q/udd/packs/all/%s?t=json" + self.dde_url = "http://46.4.235.200:8000/q/udd/packages/all/%s?t=json" + self.popcon_index = os.path.expanduser("~/.app-recommender/popcon-index") + self.popcon_dir = os.path.expanduser("~/.app-recommender/popcon-entries") + self.pkgs_filter = "program" + self.clusters_dir = os.path.expanduser("~/.app-recommender/clusters-dir") + self.k_medoids = 100 + self.max_popcon = 1000 + self.index_mode = "old" + self.strategy = "cb" + self.weight = "bm25" + self.profile_size = 50 + # options: maximal, voted, desktop + self.profiling = ["maximal"] + self.k_neighbors = 100 + self.load_options() + self.set_logger() + self.initialized = 1 + logging.info("Basic config") def usage(self): """ @@ -226,7 +231,9 @@ class Config(): file_handler = logging.handlers.RotatingFileHandler(self.output, maxBytes=50000000, backupCount=5) - log_format = '%(asctime)s AppRecommender %(levelname)-8s %(message)s' - file_handler.setFormatter(logging.Formatter(log_format)) + log_format = '%(asctime)s %(levelname)-8s %(message)s' + file_handler.setFormatter(logging.Formatter(log_format, + datefmt='%Y-%m-%d %H:%M:%S')) file_handler.setLevel(log_level) self.logger.addHandler(file_handler) + logging.info("Set up logger") -- libgit2 0.21.2