From: Michael Tremer Date: Fri, 6 Oct 2017 16:26:16 +0000 (+0100) Subject: Rename main object from Pakfire to Backend X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57859ebcf6d84be096e6d3c0af68435000780a2e;p=pbs.git Rename main object from Pakfire to Backend Signed-off-by: Michael Tremer --- diff --git a/src/buildservice/__init__.py b/src/buildservice/__init__.py index d1ef4bbf..ad2790a6 100644 --- a/src/buildservice/__init__.py +++ b/src/buildservice/__init__.py @@ -29,7 +29,7 @@ from . import users from .constants import * -class Pakfire(object): +class Backend(object): def __init__(self, config_file="pbs.conf"): # Read configuration file. self.config = self.read_config(config_file) diff --git a/src/buildservice/scheduler.py b/src/buildservice/scheduler.py index 3151dc53..1274be6f 100644 --- a/src/buildservice/scheduler.py +++ b/src/buildservice/scheduler.py @@ -5,7 +5,7 @@ import multiprocessing import time import traceback -from . import Pakfire +from . import Backend class Event(object): interval = None @@ -50,9 +50,9 @@ class Event(object): @staticmethod def fork(method, *args, **kwargs): # Create new pakfire instance. - _pakfire = Pakfire() + backend = Backend() - return method(_pakfire, *args, **kwargs) + return method(backend, *args, **kwargs) class Scheduler(object): diff --git a/src/hub/__init__.py b/src/hub/__init__.py index 3f909353..849208d5 100644 --- a/src/hub/__init__.py +++ b/src/hub/__init__.py @@ -7,7 +7,7 @@ import tornado.locale import tornado.options import tornado.web -from .. import Pakfire +from .. import Backend from . import handlers @@ -82,7 +82,7 @@ class Application(tornado.web.Application): if self.__pakfire is None: config_file = os.path.join(BASEDIR, "..", "pbs.conf") - self.__pakfire = Pakfire(config_file=config_file) + self.__pakfire = Backend(config_file=config_file) return self.__pakfire diff --git a/src/web/__init__.py b/src/web/__init__.py index 7697ece2..d077714c 100644 --- a/src/web/__init__.py +++ b/src/web/__init__.py @@ -9,6 +9,8 @@ import tornado.locale import tornado.options import tornado.web +from .. import Backend + from . import handlers_api from .handlers import * @@ -261,7 +263,7 @@ class Application(tornado.web.Application): if self.__pakfire is None: config_file = os.path.join(BASEDIR, "..", "pbs.conf") - self.__pakfire = backend.Pakfire(config_file=config_file) + self.__pakfire = Backend(config_file=config_file) return self.__pakfire