Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.core
Commits
5385f95f
Commit
5385f95f
authored
May 13, 2014
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[slapos.core] Remove cli_legacy
parent
65d7a5d4
Changes
10
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
40 additions
and
798 deletions
+40
-798
setup.py
setup.py
+0
-10
slapos/cli_legacy/__init__.py
slapos/cli_legacy/__init__.py
+0
-0
slapos/cli_legacy/bang.py
slapos/cli_legacy/bang.py
+0
-47
slapos/cli_legacy/console.py
slapos/cli_legacy/console.py
+0
-48
slapos/cli_legacy/format.py
slapos/cli_legacy/format.py
+0
-145
slapos/cli_legacy/proxy_start.py
slapos/cli_legacy/proxy_start.py
+0
-72
slapos/cli_legacy/slapgrid.py
slapos/cli_legacy/slapgrid.py
+0
-158
slapos/cli_legacy/svcbackend.py
slapos/cli_legacy/svcbackend.py
+0
-98
slapos/cli_legacy/util.py
slapos/cli_legacy/util.py
+0
-13
slapos/tests/slapgrid.py
slapos/tests/slapgrid.py
+40
-207
No files found.
setup.py
View file @
5385f95f
...
@@ -73,17 +73,7 @@ setup(name=name,
...
@@ -73,17 +73,7 @@ setup(name=name,
entry_points
=
{
entry_points
=
{
'console_scripts'
:
[
'console_scripts'
:
[
'slapos-watchdog = slapos.grid.watchdog:main'
,
'slapos-watchdog = slapos.grid.watchdog:main'
,
'slapproxy = slapos.cli_legacy.proxy_start:main'
,
'slapos = slapos.cli.entry:main'
,
'slapos = slapos.cli.entry:main'
,
# Deprecated entry points
'slapconsole = slapos.cli_legacy.console:console'
,
'slapformat = slapos.cli_legacy.format:main'
,
'slapgrid-sr = slapos.cli_legacy.slapgrid:runSoftwareRelease'
,
'slapgrid-cp = slapos.cli_legacy.slapgrid:runComputerPartition'
,
'slapgrid-ur = slapos.cli_legacy.slapgrid:runUsageReport'
,
'slapgrid-supervisorctl = slapos.cli_legacy.svcbackend:supervisorctl'
,
'slapgrid-supervisord = slapos.cli_legacy.svcbackend:supervisord'
,
'bang = slapos.cli_legacy.bang:main'
,
],
],
'slapos.cli'
:
[
'slapos.cli'
:
[
# Utilities
# Utilities
...
...
slapos/cli_legacy/__init__.py
deleted
100644 → 0
View file @
65d7a5d4
slapos/cli_legacy/bang.py
deleted
100644 → 0
View file @
65d7a5d4
# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2011, 2012 Vifib SARL and Contributors.
# All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import
argparse
import
ConfigParser
from
slapos.bang
import
do_bang
def
main
(
*
args
):
ap
=
argparse
.
ArgumentParser
()
ap
.
add_argument
(
'-m'
,
'--message'
,
default
=
''
,
help
=
'Message for bang.'
)
ap
.
add_argument
(
'configuration_file'
,
type
=
argparse
.
FileType
(),
help
=
'SlapOS configuration file.'
)
if
args
:
args
=
ap
.
parse_args
(
list
(
args
))
else
:
args
=
ap
.
parse_args
()
configp
=
ConfigParser
.
SafeConfigParser
()
configp
.
readfp
(
args
.
configuration_file
)
do_bang
(
configp
,
args
.
message
)
slapos/cli_legacy/console.py
deleted
100644 → 0
View file @
65d7a5d4
# -*- coding: utf-8 -*-
import
argparse
import
os
import
textwrap
from
slapos.client
import
ClientConfig
,
init
,
do_console
from
slapos.cli_legacy.util
import
get_config_parser
def
console
():
description
=
textwrap
.
dedent
(
"""
\
slapconsole allows you interact with slap API. You can play with the global
"slap" object and with the global "request" method.
examples :
>>> # Request instance
>>> request(kvm, "myuniquekvm")
>>> # Request software installation on owned computer
>>> supply(kvm, "mycomputer")
>>> # Fetch instance informations on already launched instance
>>> request(kvm, "myuniquekvm").getConnectionParameter("url")"""
)
ap
=
argparse
.
ArgumentParser
(
description
=
description
,
formatter_class
=
argparse
.
RawDescriptionHelpFormatter
)
ap
.
add_argument
(
'-u'
,
'--master_url'
,
default
=
None
,
help
=
'Url of SlapOS Master to use.'
)
ap
.
add_argument
(
'-k'
,
'--key_file'
,
help
=
"SSL Authorisation key file."
)
ap
.
add_argument
(
'-c'
,
'--cert_file'
,
help
=
"SSL Authorisation certificate file."
)
ap
.
add_argument
(
'configuration_file'
,
help
=
'path to slapos.cfg'
)
args
=
ap
.
parse_args
()
if
not
os
.
path
.
isfile
(
args
.
configuration_file
):
ap
.
error
(
"%s: Not found or not a regular file."
%
args
.
configuration_file
)
configp
=
get_config_parser
(
args
.
configuration_file
)
conf
=
ClientConfig
(
args
,
configp
)
local
=
init
(
conf
)
do_console
(
local
)
slapos/cli_legacy/format.py
deleted
100644 → 0
View file @
65d7a5d4
# -*- coding: utf-8 -*-
##############################################################################
#
# Copyright (c) 2010, 2011, 2012 Vifib SARL and Contributors.
# All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import
argparse
import
ConfigParser
import
logging
import
sys
import
os
from
slapos.format
import
FormatConfig
,
UsageError
,
tracing_monkeypatch
,
do_format
def
main
(
*
args
):
"Run default configuration."
ap
=
argparse
.
ArgumentParser
()
ap
.
add_argument
(
'-x'
,
'--computer_xml'
,
help
=
"Path to file with computer's XML. If does not exists, will be created"
,
default
=
None
)
ap
.
add_argument
(
'--computer_json'
,
help
=
"Path to a JSON version of the computer's XML (for development only)."
,
default
=
None
)
ap
.
add_argument
(
'-l'
,
'--log_file'
,
help
=
"The path to the log file used by the script."
)
ap
.
add_argument
(
'-i'
,
'--input_definition_file'
,
help
=
"Path to file to read definition of computer instead of "
"declaration. Using definition file allows to disable "
"'discovery' of machine services and allows to define computer "
"configuration in fully controlled manner."
)
ap
.
add_argument
(
'-o'
,
'--output_definition_file'
,
help
=
"Path to file to write definition of computer from "
"declaration."
)
ap
.
add_argument
(
'-n'
,
'--dry_run'
,
help
=
"Don't actually do anything."
,
default
=
False
,
action
=
"store_true"
)
ap
.
add_argument
(
'-v'
,
'--verbose'
,
default
=
False
,
action
=
"store_true"
,
help
=
"Verbose output."
)
# the console option is actually ignored and not used anymore.
ap
.
add_argument
(
'-c'
,
'--console'
,
default
=
False
,
action
=
"store_true"
,
help
=
"Console output."
)
ap
.
add_argument
(
'--alter_user'
,
choices
=
[
'True'
,
'False'
],
help
=
"Shall slapformat alter user database [default: True]"
)
ap
.
add_argument
(
'--alter_network'
,
choices
=
[
'True'
,
'False'
],
help
=
"Shall slapformat alter network configuration [default: True]"
)
ap
.
add_argument
(
'--now'
,
help
=
"Launch slapformat without delay"
,
default
=
False
,
action
=
"store_true"
)
ap
.
add_argument
(
'configuration_file'
,
help
=
'path to slapos.cfg'
)
if
args
:
args
=
ap
.
parse_args
(
list
(
args
))
else
:
args
=
ap
.
parse_args
()
logger
=
logging
.
getLogger
(
"slapformat"
)
logger
.
addHandler
(
logging
.
StreamHandler
())
if
args
.
verbose
:
logger
.
setLevel
(
logging
.
DEBUG
)
logger
.
debug
(
"Verbose mode enabled."
)
else
:
logger
.
setLevel
(
logging
.
INFO
)
conf
=
FormatConfig
(
logger
=
logger
)
configp
=
ConfigParser
.
SafeConfigParser
()
if
configp
.
read
(
args
.
configuration_file
)
!=
[
args
.
configuration_file
]:
raise
UsageError
(
'Cannot find or parse configuration file: %s'
%
args
.
configuration_file
)
conf
.
mergeConfig
(
args
,
configp
)
if
conf
.
log_file
:
if
not
os
.
path
.
isdir
(
os
.
path
.
dirname
(
conf
.
log_file
)):
# fallback to console only if directory for logs does not exists and
# continue to run
raise
ValueError
(
'Please create directory %r to store %r log file'
%
(
os
.
path
.
dirname
(
conf
.
log_file
),
conf
.
log_file
))
else
:
file_handler
=
logging
.
FileHandler
(
conf
.
log_file
)
file_handler
.
setFormatter
(
logging
.
Formatter
(
"%(asctime)s - "
"%(name)s - %(levelname)s - %(message)s"
))
conf
.
logger
.
addHandler
(
file_handler
)
conf
.
logger
.
info
(
'Configured logging to file %r'
%
conf
.
log_file
)
try
:
conf
.
setConfig
()
except
UsageError
as
exc
:
sys
.
stderr
.
write
(
exc
.
message
+
'
\
n
'
)
sys
.
stderr
.
write
(
"For help use --help
\
n
"
)
sys
.
exit
(
1
)
tracing_monkeypatch
(
conf
)
try
:
do_format
(
conf
=
conf
)
except
:
conf
.
logger
.
exception
(
'Uncaught exception:'
)
raise
slapos/cli_legacy/proxy_start.py
deleted
100644 → 0
View file @
65d7a5d4
# -*- coding: utf-8 -*-
# vim: set et sts=2:
import
argparse
import
ConfigParser
import
logging
import
os
import
sys
from
slapos.proxy
import
ProxyConfig
,
do_proxy
class
UsageError
(
Exception
):
pass
def
main
():
ap
=
argparse
.
ArgumentParser
()
ap
.
add_argument
(
'-l'
,
'--log_file'
,
help
=
'The path to the log file used by the script.'
)
ap
.
add_argument
(
'-v'
,
'--verbose'
,
action
=
'store_true'
,
help
=
'Verbose output.'
)
# XXX not used anymore, deprecated
ap
.
add_argument
(
'-c'
,
'--console'
,
action
=
'store_true'
,
help
=
'Console output.'
)
ap
.
add_argument
(
'-u'
,
'--database-uri'
,
help
=
'URI for sqlite database'
)
ap
.
add_argument
(
'configuration_file'
,
help
=
'path to slapos.cfg'
)
args
=
ap
.
parse_args
()
logger
=
logging
.
getLogger
(
'slapproxy'
)
logger
.
addHandler
(
logging
.
StreamHandler
())
if
args
.
verbose
:
logger
.
setLevel
(
logging
.
DEBUG
)
else
:
logger
.
setLevel
(
logging
.
INFO
)
conf
=
ProxyConfig
(
logger
=
logger
)
configp
=
ConfigParser
.
SafeConfigParser
()
if
configp
.
read
(
args
.
configuration_file
)
!=
[
args
.
configuration_file
]:
raise
UsageError
(
'Cannot find or parse configuration file: %s'
%
args
.
configuration_file
)
conf
.
mergeConfig
(
args
,
configp
)
if
conf
.
log_file
:
if
not
os
.
path
.
isdir
(
os
.
path
.
dirname
(
conf
.
log_file
)):
raise
ValueError
(
'Please create directory %r to store %r log file'
%
(
os
.
path
.
dirname
(
conf
.
log_file
),
conf
.
log_file
))
file_handler
=
logging
.
FileHandler
(
conf
.
log_file
)
file_handler
.
setFormatter
(
logging
.
Formatter
(
"%(asctime)s - %(name)s - %(levelname)s - %(message)s"
))
logger
.
addHandler
(
file_handler
)
logger
.
info
(
'Configured logging to file %r'
%
conf
.
log_file
)
conf
.
setConfig
()
try
:
do_proxy
(
conf
=
conf
)
return_code
=
0
except
SystemExit
as
err
:
return_code
=
err
sys
.
exit
(
return_code
)
slapos/cli_legacy/slapgrid.py
deleted
100644 → 0
View file @
65d7a5d4
# -*- coding: utf-8 -*-
# vim: set et sts=2:
import
argparse
import
ConfigParser
import
logging
import
sys
from
slapos.grid.utils
import
setRunning
,
setFinished
from
slapos.grid.slapgrid
import
(
merged_options
,
check_missing_parameters
,
check_missing_files
,
random_delay
,
create_slapgrid_object
)
def
parse_arguments
(
*
argument_tuple
):
"""Parse arguments and return options dictionary merged with the config file."""
ap
=
argparse
.
ArgumentParser
()
ap
.
add_argument
(
'--instance-root'
,
help
=
'The instance root directory location.'
)
ap
.
add_argument
(
'--software-root'
,
help
=
'The software_root directory location.'
)
ap
.
add_argument
(
'--master-url'
,
help
=
'The master server URL. Mandatory.'
)
ap
.
add_argument
(
'--computer-id'
,
help
=
'The computer id defined in the server.'
)
ap
.
add_argument
(
'--supervisord-socket'
,
help
=
'The socket supervisor will use.'
)
ap
.
add_argument
(
'--supervisord-configuration-path'
,
help
=
'The location where supervisord configuration will be stored.'
)
ap
.
add_argument
(
'--buildout'
,
default
=
None
,
help
=
'Location of buildout binary.'
)
ap
.
add_argument
(
'--pidfile'
,
help
=
'The location where pidfile will be created.'
)
ap
.
add_argument
(
'--logfile'
,
help
=
'The location where slapgrid logfile will be created.'
)
ap
.
add_argument
(
'--key_file'
,
help
=
'SSL Authorisation key file.'
)
ap
.
add_argument
(
'--cert_file'
,
help
=
'SSL Authorisation certificate file.'
)
ap
.
add_argument
(
'--signature_private_key_file'
,
help
=
'Signature private key file.'
)
ap
.
add_argument
(
'--master_ca_file'
,
help
=
'Root certificate of SlapOS master key.'
)
ap
.
add_argument
(
'--certificate_repository_path'
,
help
=
'Path to directory where downloaded certificates would be stored.'
)
ap
.
add_argument
(
'-v'
,
'--verbose'
,
action
=
'store_true'
,
help
=
'Be verbose.'
)
ap
.
add_argument
(
'--maximum-periodicity'
,
type
=
int
,
default
=
None
,
help
=
'Periodicity at which buildout should be run in instance.'
)
ap
.
add_argument
(
'--promise-timeout'
,
type
=
int
,
default
=
3
,
help
=
'Promise timeout in seconds.'
)
ap
.
add_argument
(
'--now'
,
action
=
'store_true'
,
help
=
'Launch slapgrid without delay. Default behavior.'
)
ap
.
add_argument
(
'--all'
,
action
=
'store_true'
,
help
=
'Launch slapgrid to process all Software Releases '
'and/or Computer Partitions.'
)
ap
.
add_argument
(
'--only-sr'
,
help
=
'Force the update of a single software release (use url hash), '
'even if is already installed. This option will make all other '
'sofware releases be ignored.'
)
ap
.
add_argument
(
'--only-cp'
,
help
=
'Update a single or a list of computer partitions '
'(ie.:slappartX, slappartY), '
'this option will make all other computer partitions be ignored.'
)
ap
.
add_argument
(
'configuration_file'
,
type
=
argparse
.
FileType
(),
help
=
'SlapOS configuration file.'
)
# Deprecated options
ap
.
add_argument
(
'-c'
,
'--console'
,
action
=
'store_true'
,
help
=
"Deprecated, doesn't do anything."
)
ap
.
add_argument
(
'--develop'
,
action
=
'store_true'
,
help
=
'Deprecated, same as --all.'
)
ap
.
add_argument
(
'--only_sr'
,
help
=
'Deprecated, same as --only-sr.'
)
ap
.
add_argument
(
'--only_cp'
,
help
=
'Deprecated, same as --only-cp.'
)
ap
.
add_argument
(
'--maximal_delay'
,
help
=
'Deprecated. Will only work from configuration file in the future.'
)
if
not
argument_tuple
:
args
=
ap
.
parse_args
()
else
:
args
=
ap
.
parse_args
(
list
(
argument_tuple
))
return
args
def
setup_logger
(
options
):
logger
=
logging
.
getLogger
(
__name__
)
if
options
.
get
(
'logfile'
):
handler
=
logging
.
FileHandler
(
options
[
'logfile'
])
else
:
handler
=
logging
.
StreamHandler
()
if
options
[
'verbose'
]:
handler
.
setLevel
(
logging
.
DEBUG
)
else
:
handler
.
setLevel
(
logging
.
INFO
)
formatter
=
logging
.
Formatter
(
fmt
=
'%(asctime)s %(name)-18s: '
'%(levelname)-8s %(message)s'
,
datefmt
=
'%Y-%m-%dT%H:%M:%S'
)
handler
.
setFormatter
(
formatter
)
logger
.
addHandler
(
handler
)
return
logger
def
parseArgumentTupleAndReturnSlapgridObject
(
*
argument_tuple
):
"""Returns a new instance of slapgrid.Slapgrid created with argument+config parameters.
Also returns the pidfile path, and configures logger.
"""
args
=
parse_arguments
(
*
argument_tuple
)
configp
=
ConfigParser
.
SafeConfigParser
()
configp
.
readfp
(
args
.
configuration_file
)
options
=
merged_options
(
args
,
configp
)
logger
=
setup_logger
(
options
)
check_missing_parameters
(
options
)
check_missing_files
(
options
)
random_delay
(
options
,
logger
=
logger
)
slapgrid_object
=
create_slapgrid_object
(
options
,
logger
=
logger
)
return
slapgrid_object
,
options
.
get
(
'pidfile'
)
def
realRun
(
argument_tuple
,
method
):
slapgrid_object
,
pidfile
=
parseArgumentTupleAndReturnSlapgridObject
(
*
argument_tuple
)
if
pidfile
:
setRunning
(
logger
=
slapgrid_object
.
logger
,
pidfile
=
pidfile
)
try
:
return
getattr
(
slapgrid_object
,
method
)()
finally
:
if
pidfile
:
setFinished
(
pidfile
)
def
runSoftwareRelease
(
*
argument_tuple
):
"""Hook for entry point to process Software Releases"""
sys
.
exit
(
realRun
(
argument_tuple
,
'processSoftwareReleaseList'
))
def
runComputerPartition
(
*
argument_tuple
):
"""Hook for entry point to process Computer Partitions"""
sys
.
exit
(
realRun
(
argument_tuple
,
'processComputerPartitionList'
))
def
runUsageReport
(
*
argument_tuple
):
"""Hook for entry point to process Usage Reports"""
sys
.
exit
(
realRun
(
argument_tuple
,
'agregateAndSendUsage'
))
slapos/cli_legacy/svcbackend.py
deleted
100644 → 0
View file @
65d7a5d4
# -*- coding: utf-8 -*-
# vim: set et sts=2:
##############################################################################
#
# Copyright (c) 2010, 2011, 2012 Vifib SARL and Contributors.
# All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly advised to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import
logging
import
os
from
optparse
import
OptionParser
import
ConfigParser
from
slapos.grid.svcbackend
import
launchSupervisord
def
getOptionDict
(
*
argument_tuple
):
usage
=
"""
Typical usage:
* %prog CONFIGURATION_FILE [arguments passed to supervisor]
"""
.
strip
()
parser
=
OptionParser
(
usage
=
usage
)
# Parses arguments
if
argument_tuple
:
(
argument_option_instance
,
argument_list
)
=
parser
.
parse_args
(
list
(
argument_tuple
))
else
:
# No arguments given to entry point : we parse sys.argv.
(
argument_option_instance
,
argument_list
)
=
parser
.
parse_args
()
if
not
argument_list
:
parser
.
error
(
"Configuration file is obligatory. Consult documentation by calling with -h."
)
configuration_file
=
argument_list
[
0
]
if
not
os
.
path
.
exists
(
configuration_file
):
parser
.
error
(
"Could not read configuration file : %s"
%
configuration_file
)
slapgrid_configuration
=
ConfigParser
.
SafeConfigParser
()
slapgrid_configuration
.
read
(
configuration_file
)
# Merges the two dictionnaries
option_dict
=
dict
(
slapgrid_configuration
.
items
(
"slapos"
))
# Supervisord configuration location
option_dict
.
setdefault
(
'supervisord_configuration_path'
,
os
.
path
.
join
(
option_dict
[
'instance_root'
],
'etc'
,
'supervisord.conf'
))
# Supervisord socket
option_dict
.
setdefault
(
'supervisord_socket'
,
os
.
path
.
join
(
option_dict
[
'instance_root'
],
'supervisord.socket'
))
return
option_dict
,
argument_list
[
1
:]
def
supervisorctl
(
*
argument_tuple
):
logger
=
logging
.
getLogger
(
'SVCBackend'
)
logger
.
setLevel
(
logging
.
INFO
)
handler
=
logging
.
StreamHandler
()
logger
.
addHandler
(
handler
)
option_dict
,
args
=
getOptionDict
(
*
argument_tuple
)
import
supervisor.supervisorctl
launchSupervisord
(
socket
=
option_dict
[
'supervisord_socket'
],
configuration_file
=
option_dict
[
'supervisord_configuration_path'
],
logger
=
logger
)
supervisor
.
supervisorctl
.
main
(
args
=
[
'-c'
,
option_dict
[
'supervisord_configuration_path'
]]
+
args
)
def
supervisord
(
*
argument_tuple
):
logger
=
logging
.
getLogger
(
'SVCBackend'
)
logger
.
setLevel
(
logging
.
INFO
)
handler
=
logging
.
StreamHandler
()
logger
.
addHandler
(
handler
)
option_dict
,
_
=
getOptionDict
(
*
argument_tuple
)
launchSupervisord
(
socket
=
option_dict
[
'supervisord_socket'
],
configuration_file
=
option_dict
[
'supervisord_configuration_path'
],
logger
=
logger
)
slapos/cli_legacy/util.py
deleted
100644 → 0
View file @
65d7a5d4
# -*- coding: utf-8 -*-
import
ConfigParser
import
os
def
get_config_parser
(
path
):
configp
=
ConfigParser
.
SafeConfigParser
()
path
=
os
.
path
.
expanduser
(
path
)
if
not
os
.
path
.
isfile
(
path
):
raise
OSError
(
'Specified configuration file %s does not exist. Exiting.'
%
path
)
configp
.
read
(
path
)
return
configp
slapos/tests/slapgrid.py
View file @
5385f95f
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment