Doron Fediuck has uploaded a new change for review. Change subject: packaging: fixed deployment related issues ......................................................................
packaging: fixed deployment related issues This patch fixes the runner execution by adding the site-packages path. Additionally, added logging to provide better information on startup. Change-Id: Ie3be5b94abbc71d841b0b278e5a893127c150b15 Signed-off-by: Doron Fediuck <[email protected]> --- M setup.py M src/ovirtscheduler/oschedproxyd.py M src/ovirtscheduler/request_handler.py M src/ovirtscheduler/runner.py 4 files changed, 20 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-scheduler-proxy refs/changes/10/18010/1 diff --git a/setup.py b/setup.py index 86cba98..930bc18 100644 --- a/setup.py +++ b/setup.py @@ -5,8 +5,8 @@ version='0.1', license='ASL2', description='oVirt Scheduler Proxy', - author='Laszlo Hornyak', - author_email='[email protected]', + author='Doron Fediuck', + author_email='[email protected]', url='http://www.ovirt.org/Features/oVirt_External_Scheduling_Proxy', packages=['ovirtscheduler'], package_dir={ '': 'src' }, diff --git a/src/ovirtscheduler/oschedproxyd.py b/src/ovirtscheduler/oschedproxyd.py index aa78849..25a210c 100644 --- a/src/ovirtscheduler/oschedproxyd.py +++ b/src/ovirtscheduler/oschedproxyd.py @@ -65,13 +65,13 @@ allow_none=True) # TODO make by config - logging.info("Loading modules") + logging.info("Loading modules from " + str(os.getcwd()) + "plugins") self._handler = RequestHandler( os.path.join(os.getcwd(), "plugins"), os.path.join(os.getcwd(), "src")) def run(self): - logging.info("Loading modules") + logging.info("Publishing API") self._server.register_introspection_functions() self._server.register_instance(API(self._handler)) self._server.serve_forever() diff --git a/src/ovirtscheduler/request_handler.py b/src/ovirtscheduler/request_handler.py index d836c8e..54cff00 100644 --- a/src/ovirtscheduler/request_handler.py +++ b/src/ovirtscheduler/request_handler.py @@ -22,6 +22,7 @@ import os from runner import PythonMethodRunner from utils import utils +import logging class RequestHandler(object): @@ -48,6 +49,7 @@ ''' def loadModules(self): loaderRunners = [] + module_files = [] for fileName in os.listdir(self._pluginDir): if not os.path.splitext(fileName)[1] == '.py': continue @@ -58,13 +60,19 @@ self._utils.LOADER_FUNC, (self._pluginDir, module)) loaderRunners.append(runner) + module_files.append(module) + logging.info("loadModules::Trying to load the following files: " + + str(module_files)) for runner in loaderRunners: runner.start() self._utils.waitOnGroup(loaderRunners) for runner in loaderRunners: + logging.debug("loadModules::script: " + str(runner._script)) + logging.info("loadModules::registering: " + + str(runner.getResults())) if runner.getResults() is None: continue @@ -83,6 +91,11 @@ self._balancers[moduleName]\ = (description, custom_properties_map) + logging.info("loadModules::registering::loaded- " + + "filters:" + str(self._filters) + + " scores:" + str(self._scores) + + " balancers:" + str(self._balancers)) + def discover(self): #temporary? return { diff --git a/src/ovirtscheduler/runner.py b/src/ovirtscheduler/runner.py index ec80cf2..353fa4c 100755 --- a/src/ovirtscheduler/runner.py +++ b/src/ovirtscheduler/runner.py @@ -21,6 +21,7 @@ from threading import Thread from ast import literal_eval from utils import utils +import os class PythonMethodRunner(Thread): @@ -53,7 +54,9 @@ return self._utils.killProcess(self._process) def createScript(self, module, method, args): + lib = os.path.dirname(__file__) commandString = ( + "import sys;" + "sys.path.insert(0, '" + lib + "');" + "import " + module + ";" + module + "." + -- To view, visit http://gerrit.ovirt.org/18010 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie3be5b94abbc71d841b0b278e5a893127c150b15 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-scheduler-proxy Gerrit-Branch: master Gerrit-Owner: Doron Fediuck <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
