Merge pull request #32 from johandahlberg/bug_fixes

Bug fixes

Author: withrocks

checkQC/__init__.py

@@ -1,2 +1,2 @@
 
-__version__ = "1.1.0"
+__version__ = "1.1.1"

checkQC/handlers/qc_handler_factory.py

@@ -2,6 +2,7 @@
 import importlib
 import pkgutil
 
+import checkQC.handlers
 from checkQC.handlers.qc_handler import QCHandler
 
 
@@ -20,10 +21,12 @@ def create_subclass_instance(class_name, class_config):
         :param class_config: dictionary with configuration for the class
         :return: A instance of the class represented by class_name
         """
-        pkgs = list(pkgutil.walk_packages('checkQC.handlers'))
-        for importer, modname, ispkg in pkgs:
-            if "checkQC.handlers" in modname:
-                importlib.import_module(modname)
+        package = checkQC.handlers
+        prefix = package.__name__ + "."
+
+        modules = list(pkgutil.iter_modules(package.__path__, prefix))
+        for importer, modname, ispkg in modules:
+            importlib.import_module(modname)
         qc_handler_subclasses = list(QCHandler.__subclasses__())
         try:
             i = list(map(lambda clazz: clazz.__name__, qc_handler_subclasses)).index(class_name)

checkQC/web_app.py

@@ -72,6 +72,10 @@ def start_web_app(self, monitoring_path, port, config_file, log_config, debug):
 
         log.info("Starting checkqc-ws at port: {}".format(port))
 
+        if not os.path.isdir(monitoring_path):
+            log.error("{} is not a directory".format(monitoring_path))
+            raise AssertionError("{} is not a directory".format(monitoring_path))
+
         # See the comment above in the CheckQCHandler as to why this somewhat backward way
         # is used to setup the server and ProcessPoolExecutor. /JD 2017-11-08
         web_app = self._make_app(monitoring_path=monitoring_path, qc_config_file=config_file, debug=debug)