X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=src%2Fnepi%2F__init__.py;h=18764d036b01fffbe165466249fcd7558a78e3d0;hb=039fbd9629d7570d4c175a5448d24badcd0f3aba;hp=c8ae48cf9f5a5ba2fd43dd7f8f84631e9a190b57;hpb=62a8f5c90afe9033f532206c811cff8ea76b2c09;p=nepi.git diff --git a/src/nepi/__init__.py b/src/nepi/__init__.py index c8ae48cf..18764d03 100644 --- a/src/nepi/__init__.py +++ b/src/nepi/__init__.py @@ -3,9 +3,8 @@ # Copyright (C) 2013 INRIA # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation; # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -17,13 +16,14 @@ # # Author: Alina Quereilhac +from __future__ import print_function + import logging import os import traceback LOGLEVEL = os.environ.get("NEPI_LOGLEVEL", "INFO").upper() LOGLEVEL = getattr(logging, LOGLEVEL) -#FORMAT = "%(asctime)s %(name)-12s %(levelname)-8s %(message)s" FORMAT = "%(asctime)s %(name)s %(levelname)-4s %(message)s" # NEPI_LOG variable contains space separated components @@ -42,9 +42,16 @@ if LOG != 'ALL': log.setLevel(LOGLEVEL) except: err = traceback.format_exc() - print "ERROR ", err + print("ERROR ", err) else: # Set the logging level defined by the user for all # components logging.basicConfig(format = FORMAT, level = LOGLEVEL) + +# Add RMs to ResourceFactory. Use NEPI_SEARCH_PATH to +# override the default path to search for RMs +from nepi.execution.resource import populate_factory +populate_factory() + +