Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Renamed the old root_service name to root_node in client.py

  • Loading branch information...
commit 96dd615849a12bec9810d8416a7f9edb4caa7b25 1 parent e4ae686
@jonathanslenders authored
Showing with 6 additions and 6 deletions.
  1. +5 −5 deployer/client.py
  2. +1 −1  examples/simple_deployment.py
View
10 deployer/client.py
@@ -37,7 +37,7 @@
import sys
-def start(root_service, name=sys.argv[0], extra_loggers=None):
+def start(root_node, name=sys.argv[0], extra_loggers=None):
"""
Client startup point.
"""
@@ -70,12 +70,12 @@ def start(root_service, name=sys.argv[0], extra_loggers=None):
# Telnet server
elif a['telnet-server']:
port = int(a['PORT']) if a['PORT'] is not None else 23
- start_telnet_server(root_service, logfile=a['--log'], port=port,
+ start_telnet_server(root_node, logfile=a['--log'], port=port,
extra_loggers=extra_loggers)
# Socket server
elif a['listen']:
- socket_name = start_server(root_service, daemonized=False,
+ socket_name = start_server(root_node, daemonized=False,
shutdown_on_last_disconnect=False,
interactive=interactive, logfile=a['--log'], socket=a['--socket'],
extra_loggers=extra_loggers)
@@ -87,7 +87,7 @@ def start(root_service, name=sys.argv[0], extra_loggers=None):
# Single threaded client
elif a['run'] and a['--single-threaded']:
- start_standalone(root_service, interactive=interactive, cd_path=path,
+ start_standalone(root_node, interactive=interactive, cd_path=path,
action_name=action, parameters=parameters, logfile=a['--log'],
extra_loggers=extra_loggers, open_scp_shell=scp)
@@ -96,7 +96,7 @@ def start(root_service, name=sys.argv[0], extra_loggers=None):
# If no socket has been given. Start a daemonized server in the
# background, and use that socket instead.
if not socket_name:
- socket_name = start_server(root_service, daemonized=True,
+ socket_name = start_server(root_node, daemonized=True,
shutdown_on_last_disconnect=True, interactive=interactive,
logfile=a['--log'], extra_loggers=extra_loggers)
View
2  examples/simple_deployment.py
@@ -36,4 +36,4 @@ def raise_exception(self):
if __name__ == '__main__':
# Start an interactive shell.
from deployer.client import start
- start(root_service=example_settings)
+ start(example_settings)
Please sign in to comment.
Something went wrong with that request. Please try again.