Merge pull request #224 from griembauer/script_importing_fix

update paths in scripts: core/common folder

scripts/actinia-server

@@ -33,10 +33,10 @@ import os
 from actinia_core.endpoints import create_endpoints
 from actinia_core.health_check import health_check
 from actinia_core.version import version
-from actinia_core.core.app import flask_app
-from actinia_core.core.config import global_config, DEFAULT_CONFIG_PATH
-from actinia_core.core.redis_interface import connect
-from actinia_core.core.process_queue import create_process_queue
+from actinia_core.core.common.app import flask_app
+from actinia_core.core.common.config import global_config, DEFAULT_CONFIG_PATH
+from actinia_core.core.common.redis_interface import connect
+from actinia_core.core.common.process_queue import create_process_queue
 
 __license__    = "GPLv3"
 __author__     = "Sören Gebbert"

scripts/actinia-user

@@ -27,9 +27,9 @@ Purpose: Command line program to manage actinia user
          entries in the Redis database
 """
 
-from actinia_core.core.user import ActiniaUser
+from actinia_core.core.common.user import ActiniaUser
 from actinia_core.core.redis_user import redis_user_interface
-from actinia_core.core.config import Configuration
+from actinia_core.core.common.config import Configuration
 import argparse
 import pprint
 import sys

scripts/rq_custom_worker

@@ -40,7 +40,7 @@ from os.path import dirname
 # https://github.com/fluent/fluent-logger-python
 import logging
 import logging.handlers
-from actinia_core.core.config import Configuration
+from actinia_core.core.common.config import Configuration
 import os
 import argparse
 import platform

scripts/rq_starter

@@ -32,7 +32,7 @@ import subprocess
 import atexit
 import time
 import argparse
-from actinia_core.core.config import Configuration
+from actinia_core.core.common.config import Configuration
 
 __license__    = "GPLv3"
 __author__     = "Sören Gebbert"