Merge pull request #44 from jelu/srv-node

Server, node

Author: jelu

dsc_datatool/__init__.py

@@ -258,6 +258,15 @@ def main():
         log_level = 0
     logging.basicConfig(format='%(asctime)s %(levelname)s %(module)s: %(message)s', level=log_level, stream=sys.stderr)
 
+    if isinstance(args.server, list):
+        args.server = ' '.join(args.server)
+    elif not isinstance(args.server, str):
+        raise Exception('Invalid argument for --server: %r' % args.server)
+    if isinstance(args.node, list):
+        args.node = ' '.join(args.node)
+    elif not isinstance(args.node, str):
+        raise Exception('Invalid argument for --node: %r' % args.node)
+
     generators = []
     if args.generator:
         for arg in args.generator:

dsc_datatool/output/influxdb.py

@@ -11,7 +11,7 @@
 import sys
 import atexit
 
-from dsc_datatool import Output
+from dsc_datatool import Output,args
 
 
 _re = re.compile(r'([,=\s])')
@@ -88,7 +88,7 @@ def close(self):
 
     def process(self, datasets):
         for dataset in datasets:
-            tags = '%s,server=%s,node=%s' % (_key(dataset.name.lower()), _val(''), _val(''))
+            tags = '%s,server=%s,node=%s' % (_key(dataset.name.lower()), args.server, args.node)
             if self.start_timestamp:
                 timestamp = dataset.start_time * 1000000000
             else: