Added option for config filename

.gitignore

@@ -108,3 +108,4 @@ output/
 .Rhistory
 docs_tmp
 venv3
+.idea/

hyperstream/config.py

@@ -40,16 +40,16 @@ def __init__(self, interval, sleep=5, iterations=100, alarm=None):
 
 class HyperStreamConfig(Printable):
     """
-    Wrapper around the hyperstream configuration file (hyperstream_config.json)
+    Wrapper around the hyperstream configuration file
     """
-    def __init__(self):
+    def __init__(self, filename="hyperstream_config.json"):
         """
         Initialise the configuration - currently uses fixed file name (hyperstream_config.json)
         """
         self.mongo = None
 
         try:
-            with open('hyperstream_config.json', 'r') as f:
+            with open(filename, 'r') as f:
                 logging.getLogger("hyperstream")
                 logging.info('Reading ' + os.path.abspath(f.name))
                 config = json.load(f)

hyperstream/hyperstream.py

@@ -47,7 +47,8 @@ class HyperStream(object):
     For py2k/py3k compatability we use the six decorator add_metaclass:
         https://pythonhosted.org/six/#six.add_metaclass
     """
-    def __init__(self, loglevel=logging.INFO, file_logger=True, console_logger=True, mqtt_logger=None):
+    def __init__(self, loglevel=logging.INFO, file_logger=True, console_logger=True, mqtt_logger=None,
+                 config_filename="hyperstream_config.json"):
         """
         Initialise the HyperStream class. This starts the logger, loads the config files, connects to the main mongodb,
         and initialises the managers (channels, plates, workflows).
@@ -61,7 +62,9 @@ def __init__(self, loglevel=logging.INFO, file_logger=True, console_logger=True,
         :param console_logger: The console logger. Either specify "True" in which case defaults are used,
         otherwise a dict optionally containing loglevel
         :param mqtt_logger: Dict containing mqtt server, topic, and optionally loglevel
+        :param config_filename: Configuration file
         """
+        self.config_filename = config_filename
         self._session = None
 
         self.parameters = dict(
@@ -73,7 +76,7 @@ def __init__(self, loglevel=logging.INFO, file_logger=True, console_logger=True,
 
         self.logger = HyperStreamLogger(
             default_loglevel=loglevel, file_logger=file_logger, console_logger=console_logger, mqtt_logger=mqtt_logger)
-        self.config = HyperStreamConfig()
+        self.config = HyperStreamConfig(filename=config_filename)
         self.client = Client(self.config.mongo)
 
         # Define some managers