Changeset: 1f3d04c409fe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1f3d04c409fe
Modified Files:
clients/iotapi/documentation/api_server_arguments.rst
clients/iotapi/src/main.py
clients/iotclient/documentation/iot_server_arguments.rst
clients/iotclient/src/main.py
Branch: iot
Log Message:
Small corrections on arguments listening
diffs (104 lines):
diff --git a/clients/iotapi/documentation/api_server_arguments.rst
b/clients/iotapi/documentation/api_server_arguments.rst
--- a/clients/iotapi/documentation/api_server_arguments.rst
+++ b/clients/iotapi/documentation/api_server_arguments.rst
@@ -45,7 +45,7 @@ Listening host of the application (IOT)
Listening port of the application (IOT) server. By default is on port
:code:`8002`.
-**-pi - -polling**
+**-po - -polling**
Set the polling interval in seconds to MonetDB database for streams updates.
By default is :code:`60` seconds.
diff --git a/clients/iotapi/src/main.py b/clients/iotapi/src/main.py
--- a/clients/iotapi/src/main.py
+++ b/clients/iotapi/src/main.py
@@ -62,19 +62,19 @@ def main():
parser = argparse.ArgumentParser(description='IOT Web API for MonetDB',
epilog="There might exist bugs!",
add_help=False)
parser.add_argument('-f', '--filesystem', type=check_path, nargs='?',
default=DEFAULT_FILESYSTEM,
- help='Baskets\' location directory (default: %s)' %
DEFAULT_FILESYSTEM)
+ help='Baskets location directory (default: %s)' %
DEFAULT_FILESYSTEM, metavar='DIRECTORY')
parser.add_argument('-l', '--log', type=check_path, nargs='?',
default=DEFAULT_LOGGING,
- help='Logging file location (default: %s)' %
DEFAULT_LOGGING)
- parser.add_argument('-pi', '--polling', type=check_positive_int,
nargs='?', default=60,
+ help='Logging file location (default: %s)' %
DEFAULT_LOGGING, metavar='FILE_PATH')
+ parser.add_argument('-po', '--polling', type=check_positive_int,
nargs='?', default=60,
help='Polling interval in seconds to the database for
streams updates (default: 60)')
parser.add_argument('-sh', '--shost', type=check_ipv4_address, nargs='?',
default='0.0.0.0',
- help='Web API server host (default: 0.0.0.0)')
+ help='Web API server host (default: 0.0.0.0)',
metavar='HOST')
parser.add_argument('-sp', '--sport', type=check_positive_int, nargs='?',
default=8002,
- help='Web API server port (default: 8002)')
+ help='Web API server port (default: 8002)',
metavar='PORT')
parser.add_argument('-h', '--host', nargs='?', default='127.0.0.1',
- help='MonetDB database host (default: 127.0.0.1)')
+ help='MonetDB database host (default: 127.0.0.1)',
metavar='HOST')
parser.add_argument('-p', '--port', type=check_positive_int, nargs='?',
default=50000,
- help='Database listening port (default: 50000)')
+ help='Database listening port (default: 50000)',
metavar='PORT')
parser.add_argument('-d', '--database', nargs='?', default='iotdb',
help='Database name (default: iotdb)')
parser.add_argument('-u', '--user', nargs='?', default='monetdb',
help='Database user (default: monetdb)')
parser.add_argument('--help', action='store_true', help='Display this
help')
diff --git a/clients/iotclient/documentation/iot_server_arguments.rst
b/clients/iotclient/documentation/iot_server_arguments.rst
--- a/clients/iotclient/documentation/iot_server_arguments.rst
+++ b/clients/iotclient/documentation/iot_server_arguments.rst
@@ -35,13 +35,13 @@ Location of logfile. On the logfile is r
Host Identifier
---------------
-If the *useidentifier* parameter is provided, an extra column on streams will
be added with a custom name of the host for later identification.
+If the *identifier* parameter is provided, an extra column on streams will be
added with a custom name of the host for later identification.
-**-ui - -useidentifier**
+**-i - -identifier**
Use a host identifier for every new stream.
-**-in - -name**
+**-n - -name**
Host identifier name. By default is the host's MAC address.
diff --git a/clients/iotclient/src/main.py b/clients/iotclient/src/main.py
--- a/clients/iotclient/src/main.py
+++ b/clients/iotclient/src/main.py
@@ -72,26 +72,26 @@ def main():
parser = argparse.ArgumentParser(description='IOT Web Server for MonetDB',
epilog="There might exist bugs!",
add_help=False)
parser.add_argument('-f', '--filesystem', type=check_path, nargs='?',
default=DEFAULT_FILESYSTEM,
- help='Baskets\' location directory (default: %s)' %
DEFAULT_FILESYSTEM)
+ help='Baskets location directory (default: %s)' %
DEFAULT_FILESYSTEM, metavar='DIRECTORY')
parser.add_argument('-l', '--log', type=check_path, nargs='?',
default=DEFAULT_LOGGING,
- help='Logging file location (default: %s)' %
DEFAULT_LOGGING)
- parser.add_argument('-ui', '--useidentifier', action='store_true',
- help='Add a host identifier to created streams. By
default will not be added')
- parser.add_argument('-in', '--name', nargs='?',
+ help='Logging file location (default: %s)' %
DEFAULT_LOGGING, metavar='FILE_PATH')
+ parser.add_argument('-i', '--identifier', action='store_true',
+ help='Add a host identifier to the created streams. By
default will not be added')
+ parser.add_argument('-n', '--name', nargs='?',
default=':'.join(("%012X" % get_mac())[i:i + 2] for i
in range(0, 12, 2)),
- help='Host identifier name. If not provided, the
machine\'s MAC address will be used')
+ help='Host identifier name. If not provided, the
machine MAC address will be used')
parser.add_argument('-ih', '--ihost', type=check_ipv4_address, nargs='?',
default='0.0.0.0',
- help='Administration server host (default: 0.0.0.0)')
+ help='Administration server host (default: 0.0.0.0)',
metavar='HOST')
parser.add_argument('-ip', '--iport', type=check_positive_int, nargs='?',
default=8000,
- help='Administration server port (default: 8000)')
+ help='Administration server port (default: 8000)',
metavar='PORT')
parser.add_argument('-ah', '--ahost', type=check_ipv4_address, nargs='?',
default='127.0.0.1',
- help='Application server host (default: 127.0.0.1)')
+ help='Application server host (default: 127.0.0.1)',
metavar='HOST')
parser.add_argument('-ap', '--aport', type=check_positive_int, nargs='?',
default=8001,
- help='Application server port (default: 8001)')
+ help='Application server port (default: 8001)',
metavar='PORT')
parser.add_argument('-h', '--host', nargs='?', default='127.0.0.1',
- help='MonetDB database host (default: 127.0.0.1)')
+ help='MonetDB database host (default: 127.0.0.1)',
metavar='HOST')
parser.add_argument('-p', '--port', type=check_positive_int, nargs='?',
default=50000,
- help='Database listening port (default: 50000)')
+ help='Database listening port (default: 50000)',
metavar='PORT')
parser.add_argument('-d', '--database', nargs='?', default='iotdb',
help='Database name (default: iotdb)')
parser.add_argument('-u', '--user', nargs='?', default='monetdb',
help='Database user (default: monetdb)')
parser.add_argument('--help', action='store_true', help='Display this
help')
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
