Make all settings strings

albertovm · Jun 14, 2013 · 9362982 · 9362982
1 parent 78aafb4
commit 9362982
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/oemgatewaybuffer.py b/oemgatewaybuffer.py
@@ -22,15 +22,7 @@
 class OemGatewayBuffer(object):
 
     def __init__(self):
-        """Create a server data buffer initialized with server settings.
-        
-        domain (string): domain name (eg: 'domain.tld')
-        path (string): emoncms path with leading slash (eg: '/emoncms')
-        apikey (string): API key with write access
-        period (int): sending interval in seconds
-        active (bool): whether the data buffer is active
-        
-        """
+        """Create a server data buffer initialized with server settings."""
 
         # Initialize logger
         self._log = logging.getLogger("OemGateway")
@@ -45,6 +37,12 @@ def set(self, **kwargs):
         
         **kwargs (dict): settings to be modified.
         
+        domain (string): domain name (eg: 'domain.tld')
+        path (string): emoncms path with leading slash (eg: '/emoncms')
+        apikey (string): API key with write access
+        period (string): sending interval in seconds
+        active (string): whether the data buffer is active (True/False)
+        
         """
 
         for key, value in kwargs.iteritems():
@@ -57,7 +55,7 @@ def add_data(self, data):
 
         """
 
-        if not self._settings['active']:
+        if not bool(self._settings['active']):
             return
 
         self._log.debug("Server " + 
@@ -78,7 +76,7 @@ def check_time(self):
 
         """
         now = time.time()
-        if (now - self._last_send > self._settings['period']):
+        if (now - self._last_send > int(self._settings['period'])):
             return True
 
     def has_data(self):
@@ -108,7 +106,7 @@ class OemGatewayEmoncmsBuffer(OemGatewayBuffer):
     def send_data(self):
         """Send data to server."""
 
-        if not self._settings['active']:
+        if not bool(self._settings['active']):
             return
 
         # Prepare data string with the values in data buffer

diff --git a/oemgatewayinterface.py b/oemgatewayinterface.py
@@ -174,8 +174,8 @@ def check_settings(self):
             'domain': 'localhost',
             'path': '/emoncms',
             'apikey': emoncms_s['apikey'],
-            'period': 0,
-            'active': True}
+            'period': '0',
+            'active': 'True'}
         # Remote
         settings['buffers']['emoncms_remote'] = \
             {'type': 'OemGatewayEmoncmsBuffer',
@@ -186,8 +186,8 @@ def check_settings(self):
             'domain': emoncms_s['remotedomain'],
             'path': emoncms_s['remotepath'],
             'apikey': emoncms_s['remoteapikey'],
-            'period': 30,
-            'active': bool(emoncms_s['remotesend'])}
+            'period': '30',
+            'active': emoncms_s['remotesend']}
 
         # Return True if settings modified
         if settings != self.settings: