saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Use mixin for the daemon classes

Browse source
This commit is contained in:
Bo Maryniuk 2016-02-26 18:30:47 +01:00
parent 82dd383630
commit 63eedefe54
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cli/daemons.py
View file

@ -58,7 +58,6 @@ from salt.exceptions import SaltSystemExit
logger = salt.log.setup.logging.getLogger(__name__)
class Master(parsers.MasterOptionParser):
class DaemonsMixin(object): # pylint: disable=no-init
'''
Uses the same functions for all daemons
@ -102,6 +101,7 @@ class DaemonsMixin(object): # pylint: disable=no-init
sys.exit(error.errno)
class Master(parsers.MasterOptionParser, DaemonsMixin): # pylint: disable=no-init
'''
Creates a master server
'''
@ -206,7 +206,7 @@ class DaemonsMixin(object): # pylint: disable=no-init
logger.info('The salt master is shut down')
class Minion(parsers.MinionOptionParser): # pylint: disable=no-init
class Minion(parsers.MinionOptionParser, DaemonsMixin): # pylint: disable=no-init
'''
Create a minion server
'''
@ -356,7 +356,7 @@ class Minion(parsers.MinionOptionParser): # pylint: disable=no-init
logger.info('The salt minion is shut down')
class ProxyMinion(parsers.ProxyMinionOptionParser): # pylint: disable=no-init
class ProxyMinion(parsers.ProxyMinionOptionParser, DaemonsMixin): # pylint: disable=no-init
'''
Create a proxy minion server
'''
@ -495,7 +495,7 @@ class ProxyMinion(parsers.ProxyMinionOptionParser): # pylint: disable=no-init
logger.info('The proxy minion is shut down')
class Syndic(parsers.SyndicOptionParser):
class Syndic(parsers.SyndicOptionParser, DaemonsMixin): # pylint: disable=no-init
'''
Create a syndic server
'''