Browse Source

Fix nilmrun scripts for python 3

tags/nilmrun-2.0.2
Jim Paris 3 years ago
parent
commit
079a2b5192
4 changed files with 15 additions and 11 deletions
  1. +3
    -2
      scripts/kill.py
  2. +3
    -3
      scripts/nilmrun_server.py
  3. +4
    -3
      scripts/ps.py
  4. +5
    -3
      scripts/run.py

+ 3
- 2
scripts/kill.py View File

@@ -13,8 +13,9 @@ def main():
def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
parser = argparse.ArgumentParser(
description = 'Kill/remove a process from the NilmRun server',
formatter_class = argparse.ArgumentDefaultsHelpFormatter,
version = nilmrun.__version__)
formatter_class = argparse.ArgumentDefaultsHelpFormatter)
parser.add_argument("-v", "--version", action="version",
version=nilmrun.__version__)
group = parser.add_argument_group("Standard options")
group.add_argument('-u', '--url',
help = 'NilmRun server URL', default = def_url)


+ 3
- 3
scripts/nilmrun_server.py View File

@@ -10,8 +10,9 @@ def main():

parser = argparse.ArgumentParser(
description = 'Run the NilmRun server',
formatter_class = argparse.ArgumentDefaultsHelpFormatter,
version = nilmrun.__version__)
formatter_class = argparse.ArgumentDefaultsHelpFormatter)
parser.add_argument("-v", "--version", action="version",
version=nilmrun.__version__)

group = parser.add_argument_group("Standard options")
group.add_argument('-a', '--address',
@@ -34,7 +35,6 @@ def main():
embedded = False
server = nilmrun.server.Server(host = args.address,
port = args.port,
embedded = embedded,
force_traceback = args.traceback)

# Print info


+ 4
- 3
scripts/ps.py View File

@@ -2,7 +2,7 @@

from nilmdb.client.httpclient import HTTPClient, ClientError, ServerError
from nilmdb.utils.printf import *
from nilmdb.utils import datetime_tz
import datetime_tz
import nilmrun

import argparse
@@ -13,8 +13,9 @@ def main():
def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
parser = argparse.ArgumentParser(
description = 'List NilmRun processes',
formatter_class = argparse.ArgumentDefaultsHelpFormatter,
version = nilmrun.__version__)
formatter_class = argparse.ArgumentDefaultsHelpFormatter)
parser.add_argument("-v", "--version", action="version",
version=nilmrun.__version__)
group = parser.add_argument_group("Standard options")
group.add_argument('-u', '--url',
help = 'NilmRun server URL', default = def_url)


+ 5
- 3
scripts/run.py View File

@@ -14,8 +14,9 @@ def main():
def_url = os.environ.get("NILMRUN_URL", "http://localhost/nilmrun/")
parser = argparse.ArgumentParser(
description = 'Run a command on the NilmRun server',
formatter_class = argparse.ArgumentDefaultsHelpFormatter,
version = nilmrun.__version__)
formatter_class = argparse.ArgumentDefaultsHelpFormatter)
parser.add_argument("-v", "--version", action="version",
version=nilmrun.__version__)
group = parser.add_argument_group("Standard options")
group.add_argument('-u', '--url',
help = 'NilmRun server URL', default = def_url)
@@ -30,7 +31,8 @@ def main():
help="Arguments for command")
args = parser.parse_args()

client = HTTPClient(baseurl = args.url, verify_ssl = not args.noverify)
client = HTTPClient(baseurl=args.url, verify_ssl=not args.noverify,
post_json=True)

# Run command
pid = client.post("run/command", { "argv": [ args.cmd ] + args.arg })


Loading…
Cancel
Save